diff --git a/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix
new file mode 100644
index 0000000000..5cb09e5af4
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+let
+ inherit (lib) mkOption mkIf types;
+ cfg = config.hardware.keyboard.zsa;
+in
+{
+ # TODO: make group configurable like in https://github.com/NixOS/nixpkgs/blob/0b2b4b8c4e729535a61db56468809c5c2d3d175c/pkgs/tools/security/nitrokey-app/udev-rules.nix ?
+ options.hardware.keyboard.zsa = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables udev rules for keyboards from ZSA like the ErgoDox EZ, Planck EZ and Moonlander Mark I.
+ You need it when you want to flash a new configuration on the keyboard
+ or use their live training in the browser.
+ Access to the keyboard is granted to users in the "plugdev" group.
+ You may want to install the wally-cli package.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [ pkgs.zsa-udev-rules ];
+ users.groups.plugdev = {};
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 3b67a85749..ed6a493e27 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -47,6 +47,7 @@
./hardware/digitalbitbox.nix
./hardware/device-tree.nix
./hardware/sensor/iio.nix
+ ./hardware/keyboard/zsa.nix
./hardware/ksm.nix
./hardware/ledger.nix
./hardware/logitech.nix
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
index 3ee7a81dc3..35a9dccdff 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
@@ -44,6 +44,9 @@ let
[gitlab-shell]
dir = "${cfg.packages.gitlab-shell}"
+ [hooks]
+ custom_hooks_dir = "${cfg.statePath}/custom_hooks"
+
[gitlab]
secret_file = "${cfg.statePath}/gitlab_shell_secret"
url = "http+unix://${pathUrlQuote gitlabSocket}"
@@ -65,7 +68,6 @@ let
repos_path = "${cfg.statePath}/repositories";
secret_file = "${cfg.statePath}/gitlab_shell_secret";
log_file = "${cfg.statePath}/log/gitlab-shell.log";
- custom_hooks_dir = "${cfg.statePath}/custom_hooks";
redis = {
bin = "${pkgs.redis}/bin/redis-cli";
host = "127.0.0.1";
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
index dc78728d66..de3c7d693d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -126,6 +126,13 @@ let
'';
+ luaSetPaths = ''
+
+ LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so
+ LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua
+
+ '';
+
mkVHostConf = hostOpts:
let
adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr;
@@ -326,6 +333,8 @@ let
${sslConf}
+ ${if cfg.package.luaSupport then luaSetPaths else ""}
+
# Fascist default - deny access to everything.
Options FollowSymLinks
diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix
index 5fda24adb9..ac41ba5f93 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -49,8 +49,8 @@ in
}
(mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
- # the cryptographic modules are required only for decryption attempts
- boot.initrd.availableKernelModules = [ "bcachefs" "chacha20" "poly1305" ];
+ # chacha20 and poly1305 are required only for decryption attempts
+ boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ];
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs
diff --git a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
index 5fbfdc787e..a4f5867128 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
@@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "helio-workstation";
- version = "3.1";
+ version = "3.3";
src = fetchFromGitHub {
owner = "helio-fm";
repo = pname;
rev = version;
fetchSubmodules = true;
- sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6";
+ sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY=";
};
buildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "One music sequencer for all major platforms, both desktop and mobile";
homepage = "https://helio.fm/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = [ maintainers.suhr ];
platforms = [ "x86_64-linux" ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/cargo-lock.patch
new file mode 100644
index 0000000000..2b3366476d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/cargo-lock.patch
@@ -0,0 +1,2309 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..45720a8
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,2303 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "addr2line"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
++dependencies = [
++ "gimli",
++]
++
++[[package]]
++name = "adler"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "alsa-sys"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
++dependencies = [
++ "libc",
++ "pkg-config",
++]
++
++[[package]]
++name = "arrayref"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
++
++[[package]]
++name = "arrayvec"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
++
++[[package]]
++name = "async-compression"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537"
++dependencies = [
++ "bytes 0.5.6",
++ "flate2",
++ "futures-core",
++ "memchr",
++ "pin-project-lite 0.2.0",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++
++[[package]]
++name = "backtrace"
++version = "0.3.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598"
++dependencies = [
++ "addr2line",
++ "cfg-if 1.0.0",
++ "libc",
++ "miniz_oxide",
++ "object",
++ "rustc-demangle",
++]
++
++[[package]]
++name = "base-x"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
++
++[[package]]
++name = "base64"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
++
++[[package]]
++name = "base64"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++
++[[package]]
++name = "bindgen"
++version = "0.56.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
++dependencies = [
++ "bitflags",
++ "cexpr",
++ "clang-sys",
++ "lazy_static 1.4.0",
++ "lazycell",
++ "peeking_take_while",
++ "proc-macro2",
++ "quote",
++ "regex",
++ "rustc-hash",
++ "shlex",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "blake2b_simd"
++version = "0.5.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
++dependencies = [
++ "arrayref",
++ "arrayvec",
++ "constant_time_eq",
++]
++
++[[package]]
++name = "bumpalo"
++version = "3.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
++
++[[package]]
++name = "byteorder"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
++
++[[package]]
++name = "bytes"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
++dependencies = [
++ "byteorder",
++ "iovec",
++]
++
++[[package]]
++name = "bytes"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
++
++[[package]]
++name = "cassowary"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
++
++[[package]]
++name = "cc"
++version = "1.0.66"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
++
++[[package]]
++name = "cexpr"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
++dependencies = [
++ "nom 5.1.2",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "chrono"
++version = "0.4.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
++dependencies = [
++ "libc",
++ "num-integer",
++ "num-traits 0.2.14",
++ "time 0.1.44",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "clang-sys"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c"
++dependencies = [
++ "glob",
++ "libc",
++ "libloading",
++]
++
++[[package]]
++name = "claxon"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
++
++[[package]]
++name = "config"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6"
++dependencies = [
++ "lazy_static 1.4.0",
++ "nom 4.2.3",
++ "rust-ini",
++ "serde 1.0.118",
++ "serde-hjson",
++ "serde_json",
++ "toml",
++ "yaml-rust",
++]
++
++[[package]]
++name = "const_fn"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
++
++[[package]]
++name = "cookie"
++version = "0.14.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f"
++dependencies = [
++ "percent-encoding",
++ "time 0.2.23",
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "cookie_store"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3"
++dependencies = [
++ "cookie",
++ "idna",
++ "log",
++ "publicsuffix",
++ "serde 1.0.118",
++ "serde_json",
++ "time 0.2.23",
++ "url",
++]
++
++[[package]]
++name = "core-foundation"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
++dependencies = [
++ "core-foundation-sys 0.8.2",
++ "libc",
++]
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
++
++[[package]]
++name = "coreaudio-rs"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
++dependencies = [
++ "bitflags",
++ "coreaudio-sys",
++]
++
++[[package]]
++name = "coreaudio-sys"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
++dependencies = [
++ "bindgen",
++]
++
++[[package]]
++name = "cpal"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120"
++dependencies = [
++ "alsa-sys",
++ "core-foundation-sys 0.6.2",
++ "coreaudio-rs",
++ "failure",
++ "lazy_static 1.4.0",
++ "libc",
++ "num-traits 0.2.14",
++ "stdweb 0.1.3",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "crc32fast"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
++dependencies = [
++ "autocfg",
++ "cfg-if 1.0.0",
++ "lazy_static 1.4.0",
++]
++
++[[package]]
++name = "dbus"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e"
++dependencies = [
++ "libc",
++ "libdbus-sys",
++]
++
++[[package]]
++name = "dirs"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
++dependencies = [
++ "cfg-if 0.1.10",
++ "dirs-sys",
++]
++
++[[package]]
++name = "dirs-sys"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
++dependencies = [
++ "libc",
++ "redox_users",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "discard"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
++
++[[package]]
++name = "dtoa"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
++
++[[package]]
++name = "either"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++
++[[package]]
++name = "encoding_rs"
++version = "0.8.26"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "error-chain"
++version = "0.12.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
++dependencies = [
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "failure"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
++dependencies = [
++ "backtrace",
++ "failure_derive",
++]
++
++[[package]]
++name = "failure_derive"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "synstructure",
++]
++
++[[package]]
++name = "flate2"
++version = "1.0.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
++dependencies = [
++ "cfg-if 1.0.0",
++ "crc32fast",
++ "libc",
++ "miniz_oxide",
++]
++
++[[package]]
++name = "fnv"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++
++[[package]]
++name = "foreign-types"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
++dependencies = [
++ "foreign-types-shared",
++]
++
++[[package]]
++name = "foreign-types-shared"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
++dependencies = [
++ "matches",
++ "percent-encoding",
++]
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++dependencies = [
++ "bitflags",
++ "fuchsia-zircon-sys",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++
++[[package]]
++name = "futures"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-executor",
++ "futures-io",
++ "futures-sink",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-channel"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
++dependencies = [
++ "futures-core",
++ "futures-sink",
++]
++
++[[package]]
++name = "futures-core"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
++
++[[package]]
++name = "futures-executor"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
++dependencies = [
++ "futures-core",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-io"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
++
++[[package]]
++name = "futures-macro"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
++dependencies = [
++ "proc-macro-hack",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "futures-sink"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
++
++[[package]]
++name = "futures-task"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
++dependencies = [
++ "once_cell",
++]
++
++[[package]]
++name = "futures-util"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-io",
++ "futures-macro",
++ "futures-sink",
++ "futures-task",
++ "memchr",
++ "pin-project 1.0.2",
++ "pin-utils",
++ "proc-macro-hack",
++ "proc-macro-nested",
++ "slab",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
++dependencies = [
++ "cfg-if 0.1.10",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "gimli"
++version = "0.23.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
++
++[[package]]
++name = "glob"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
++
++[[package]]
++name = "h2"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
++dependencies = [
++ "bytes 0.5.6",
++ "fnv",
++ "futures-core",
++ "futures-sink",
++ "futures-util",
++ "http",
++ "indexmap",
++ "slab",
++ "tokio",
++ "tokio-util",
++ "tracing",
++ "tracing-futures",
++]
++
++[[package]]
++name = "hashbrown"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "hex"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
++
++[[package]]
++name = "hound"
++version = "3.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
++
++[[package]]
++name = "http"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
++dependencies = [
++ "bytes 0.5.6",
++ "fnv",
++ "itoa",
++]
++
++[[package]]
++name = "http-body"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
++dependencies = [
++ "bytes 0.5.6",
++ "http",
++]
++
++[[package]]
++name = "httparse"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
++
++[[package]]
++name = "httpdate"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
++
++[[package]]
++name = "hyper"
++version = "0.13.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
++dependencies = [
++ "bytes 0.5.6",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "h2",
++ "http",
++ "http-body",
++ "httparse",
++ "httpdate",
++ "itoa",
++ "pin-project 1.0.2",
++ "socket2",
++ "tokio",
++ "tower-service",
++ "tracing",
++ "want",
++]
++
++[[package]]
++name = "hyper-tls"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
++dependencies = [
++ "bytes 0.5.6",
++ "hyper",
++ "native-tls",
++ "tokio",
++ "tokio-tls",
++]
++
++[[package]]
++name = "idna"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
++dependencies = [
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "indexmap"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
++dependencies = [
++ "autocfg",
++ "hashbrown",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "ipnet"
++version = "2.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
++
++[[package]]
++name = "itertools"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
++
++[[package]]
++name = "js-sys"
++version = "0.3.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
++dependencies = [
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
++
++[[package]]
++name = "lazy_static"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "lazycell"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
++
++[[package]]
++name = "lewton"
++version = "0.9.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
++dependencies = [
++ "byteorder",
++ "ogg",
++ "smallvec",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.81"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
++
++[[package]]
++name = "libdbus-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0"
++dependencies = [
++ "pkg-config",
++]
++
++[[package]]
++name = "libloading"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc"
++dependencies = [
++ "cfg-if 1.0.0",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "linked-hash-map"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
++dependencies = [
++ "serde 0.8.23",
++ "serde_test",
++]
++
++[[package]]
++name = "linked-hash-map"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
++
++[[package]]
++name = "log"
++version = "0.4.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
++dependencies = [
++ "cfg-if 0.1.10",
++]
++
++[[package]]
++name = "log-panics"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef"
++dependencies = [
++ "log",
++]
++
++[[package]]
++name = "mach"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++
++[[package]]
++name = "memchr"
++version = "2.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++
++[[package]]
++name = "mime"
++version = "0.3.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
++
++[[package]]
++name = "mime_guess"
++version = "2.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
++dependencies = [
++ "mime",
++ "unicase",
++]
++
++[[package]]
++name = "minimp3"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dce0cff6a0bfd3f8b6b2350819bbddd63bc65cc45e53888bdd0ff49dde16d2d5"
++dependencies = [
++ "minimp3-sys",
++ "slice-deque",
++]
++
++[[package]]
++name = "minimp3-sys"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "miniz_oxide"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
++dependencies = [
++ "adler",
++ "autocfg",
++]
++
++[[package]]
++name = "mio"
++version = "0.6.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
++dependencies = [
++ "cfg-if 0.1.10",
++ "fuchsia-zircon",
++ "fuchsia-zircon-sys",
++ "iovec",
++ "kernel32-sys",
++ "libc",
++ "log",
++ "miow",
++ "net2",
++ "slab",
++ "winapi 0.2.8",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
++dependencies = [
++ "kernel32-sys",
++ "net2",
++ "winapi 0.2.8",
++ "ws2_32-sys",
++]
++
++[[package]]
++name = "mp3-duration"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f"
++dependencies = [
++ "thiserror",
++]
++
++[[package]]
++name = "native-tls"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f"
++dependencies = [
++ "lazy_static 1.4.0",
++ "libc",
++ "log",
++ "openssl",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "security-framework",
++ "security-framework-sys",
++ "tempfile",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
++dependencies = [
++ "cfg-if 0.1.10",
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "netease_music_tui"
++version = "0.1.1"
++dependencies = [
++ "base64 0.11.0",
++ "byteorder",
++ "bytes 0.4.12",
++ "chrono",
++ "config",
++ "dbus",
++ "dirs",
++ "failure",
++ "futures",
++ "hex",
++ "lazy_static 1.4.0",
++ "log",
++ "log-panics",
++ "mp3-duration",
++ "num-bigint",
++ "openssl",
++ "rand",
++ "regex",
++ "reqwest",
++ "rodio",
++ "serde 1.0.118",
++ "serde_derive",
++ "serde_json",
++ "serde_urlencoded 0.6.1",
++ "simple-logging",
++ "tempfile",
++ "termion",
++ "tokio",
++ "tui",
++ "unicode-width",
++]
++
++[[package]]
++name = "nom"
++version = "4.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
++dependencies = [
++ "memchr",
++ "version_check 0.1.5",
++]
++
++[[package]]
++name = "nom"
++version = "5.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
++dependencies = [
++ "memchr",
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
++dependencies = [
++ "autocfg",
++ "num-integer",
++ "num-traits 0.2.14",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
++dependencies = [
++ "autocfg",
++ "num-traits 0.2.14",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
++dependencies = [
++ "num-traits 0.2.14",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "numtoa"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
++
++[[package]]
++name = "object"
++version = "0.22.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
++
++[[package]]
++name = "ogg"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13e571c3517af9e1729d4c63571a27edd660ade0667973bfc74a67c660c2b651"
++dependencies = [
++ "byteorder",
++]
++
++[[package]]
++name = "once_cell"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
++
++[[package]]
++name = "openssl"
++version = "0.10.32"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70"
++dependencies = [
++ "bitflags",
++ "cfg-if 1.0.0",
++ "foreign-types",
++ "lazy_static 1.4.0",
++ "libc",
++ "openssl-sys",
++]
++
++[[package]]
++name = "openssl-probe"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6"
++dependencies = [
++ "autocfg",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "peeking_take_while"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
++
++[[package]]
++name = "percent-encoding"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++
++[[package]]
++name = "pin-project"
++version = "0.4.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
++dependencies = [
++ "pin-project-internal 0.4.27",
++]
++
++[[package]]
++name = "pin-project"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
++dependencies = [
++ "pin-project-internal 1.0.2",
++]
++
++[[package]]
++name = "pin-project-internal"
++version = "0.4.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pin-project-internal"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pin-project-lite"
++version = "0.1.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
++
++[[package]]
++name = "pin-project-lite"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
++
++[[package]]
++name = "pin-utils"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++
++[[package]]
++name = "proc-macro-hack"
++version = "0.5.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
++
++[[package]]
++name = "proc-macro-nested"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "publicsuffix"
++version = "1.5.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
++dependencies = [
++ "error-chain",
++ "idna",
++ "lazy_static 1.4.0",
++ "regex",
++ "url",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom",
++ "libc",
++ "rand_chacha",
++ "rand_core",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++dependencies = [
++ "rand_core",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.57"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
++
++[[package]]
++name = "redox_termios"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
++dependencies = [
++ "redox_syscall",
++]
++
++[[package]]
++name = "redox_users"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
++dependencies = [
++ "getrandom",
++ "redox_syscall",
++ "rust-argon2",
++]
++
++[[package]]
++name = "regex"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "reqwest"
++version = "0.10.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
++dependencies = [
++ "async-compression",
++ "base64 0.13.0",
++ "bytes 0.5.6",
++ "cookie",
++ "cookie_store",
++ "encoding_rs",
++ "futures-core",
++ "futures-util",
++ "http",
++ "http-body",
++ "hyper",
++ "hyper-tls",
++ "ipnet",
++ "js-sys",
++ "lazy_static 1.4.0",
++ "log",
++ "mime",
++ "mime_guess",
++ "native-tls",
++ "percent-encoding",
++ "pin-project-lite 0.2.0",
++ "serde 1.0.118",
++ "serde_urlencoded 0.7.0",
++ "time 0.2.23",
++ "tokio",
++ "tokio-socks",
++ "tokio-tls",
++ "url",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++ "winreg",
++]
++
++[[package]]
++name = "rodio"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262"
++dependencies = [
++ "claxon",
++ "cpal",
++ "hound",
++ "lazy_static 1.4.0",
++ "lewton",
++ "minimp3",
++]
++
++[[package]]
++name = "rust-argon2"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
++dependencies = [
++ "base64 0.13.0",
++ "blake2b_simd",
++ "constant_time_eq",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "rust-ini"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
++
++[[package]]
++name = "rustc-hash"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++dependencies = [
++ "semver",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++
++[[package]]
++name = "schannel"
++version = "0.1.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
++dependencies = [
++ "lazy_static 1.4.0",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "security-framework"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69"
++dependencies = [
++ "bitflags",
++ "core-foundation",
++ "core-foundation-sys 0.8.2",
++ "libc",
++ "security-framework-sys",
++]
++
++[[package]]
++name = "security-framework-sys"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b"
++dependencies = [
++ "core-foundation-sys 0.8.2",
++ "libc",
++]
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++dependencies = [
++ "semver-parser",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++
++[[package]]
++name = "serde"
++version = "0.8.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
++
++[[package]]
++name = "serde"
++version = "1.0.118"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde-hjson"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
++dependencies = [
++ "lazy_static 0.2.11",
++ "linked-hash-map 0.3.0",
++ "num-traits 0.1.43",
++ "regex",
++ "serde 0.8.23",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.118"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
++dependencies = [
++ "itoa",
++ "ryu",
++ "serde 1.0.118",
++]
++
++[[package]]
++name = "serde_test"
++version = "0.8.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
++dependencies = [
++ "serde 0.8.23",
++]
++
++[[package]]
++name = "serde_urlencoded"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
++dependencies = [
++ "dtoa",
++ "itoa",
++ "serde 1.0.118",
++ "url",
++]
++
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
++dependencies = [
++ "form_urlencoded",
++ "itoa",
++ "ryu",
++ "serde 1.0.118",
++]
++
++[[package]]
++name = "sha1"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
++
++[[package]]
++name = "shlex"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
++
++[[package]]
++name = "simple-logging"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542"
++dependencies = [
++ "lazy_static 1.4.0",
++ "log",
++ "thread-id",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++
++[[package]]
++name = "slice-deque"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25"
++dependencies = [
++ "libc",
++ "mach",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
++dependencies = [
++ "maybe-uninit",
++]
++
++[[package]]
++name = "socket2"
++version = "0.3.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "standback"
++version = "0.2.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8"
++dependencies = [
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "stdweb"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
++
++[[package]]
++name = "stdweb"
++version = "0.4.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
++dependencies = [
++ "discard",
++ "rustc_version",
++ "stdweb-derive",
++ "stdweb-internal-macros",
++ "stdweb-internal-runtime",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "stdweb-derive"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "serde 1.0.118",
++ "serde_derive",
++ "syn",
++]
++
++[[package]]
++name = "stdweb-internal-macros"
++version = "0.2.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
++dependencies = [
++ "base-x",
++ "proc-macro2",
++ "quote",
++ "serde 1.0.118",
++ "serde_derive",
++ "serde_json",
++ "sha1",
++ "syn",
++]
++
++[[package]]
++name = "stdweb-internal-runtime"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
++
++[[package]]
++name = "syn"
++version = "1.0.55"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "synstructure"
++version = "0.12.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
++dependencies = [
++ "cfg-if 0.1.10",
++ "libc",
++ "rand",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "termion"
++version = "1.5.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905"
++dependencies = [
++ "libc",
++ "numtoa",
++ "redox_syscall",
++ "redox_termios",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
++dependencies = [
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "thread-id"
++version = "3.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
++dependencies = [
++ "libc",
++ "redox_syscall",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++dependencies = [
++ "lazy_static 1.4.0",
++]
++
++[[package]]
++name = "time"
++version = "0.1.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
++dependencies = [
++ "libc",
++ "wasi 0.10.0+wasi-snapshot-preview1",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "time"
++version = "0.2.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
++dependencies = [
++ "const_fn",
++ "libc",
++ "standback",
++ "stdweb 0.4.20",
++ "time-macros",
++ "version_check 0.9.2",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "time-macros"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
++dependencies = [
++ "proc-macro-hack",
++ "time-macros-impl",
++]
++
++[[package]]
++name = "time-macros-impl"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
++dependencies = [
++ "proc-macro-hack",
++ "proc-macro2",
++ "quote",
++ "standback",
++ "syn",
++]
++
++[[package]]
++name = "tinyvec"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
++
++[[package]]
++name = "tokio"
++version = "0.2.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
++dependencies = [
++ "bytes 0.5.6",
++ "fnv",
++ "futures-core",
++ "iovec",
++ "lazy_static 1.4.0",
++ "memchr",
++ "mio",
++ "num_cpus",
++ "pin-project-lite 0.1.11",
++ "slab",
++ "tokio-macros",
++]
++
++[[package]]
++name = "tokio-macros"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "tokio-socks"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539"
++dependencies = [
++ "bytes 0.4.12",
++ "either",
++ "futures",
++ "thiserror",
++ "tokio",
++]
++
++[[package]]
++name = "tokio-tls"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
++dependencies = [
++ "native-tls",
++ "tokio",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
++dependencies = [
++ "bytes 0.5.6",
++ "futures-core",
++ "futures-sink",
++ "log",
++ "pin-project-lite 0.1.11",
++ "tokio",
++]
++
++[[package]]
++name = "toml"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
++dependencies = [
++ "serde 1.0.118",
++]
++
++[[package]]
++name = "tower-service"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
++
++[[package]]
++name = "tracing"
++version = "0.1.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
++dependencies = [
++ "cfg-if 1.0.0",
++ "log",
++ "pin-project-lite 0.2.0",
++ "tracing-core",
++]
++
++[[package]]
++name = "tracing-core"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
++dependencies = [
++ "lazy_static 1.4.0",
++]
++
++[[package]]
++name = "tracing-futures"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
++dependencies = [
++ "pin-project 0.4.27",
++ "tracing",
++]
++
++[[package]]
++name = "try-lock"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
++
++[[package]]
++name = "tui"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee"
++dependencies = [
++ "bitflags",
++ "cassowary",
++ "either",
++ "itertools",
++ "log",
++ "termion",
++ "unicode-segmentation",
++ "unicode-width",
++]
++
++[[package]]
++name = "unicase"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
++dependencies = [
++ "version_check 0.9.2",
++]
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++dependencies = [
++ "matches",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
++dependencies = [
++ "tinyvec",
++]
++
++[[package]]
++name = "unicode-segmentation"
++version = "1.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
++
++[[package]]
++name = "unicode-width"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++
++[[package]]
++name = "url"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
++dependencies = [
++ "form_urlencoded",
++ "idna",
++ "matches",
++ "percent-encoding",
++]
++
++[[package]]
++name = "vcpkg"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
++
++[[package]]
++name = "version_check"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
++
++[[package]]
++name = "version_check"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
++
++[[package]]
++name = "want"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
++dependencies = [
++ "log",
++ "try-lock",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.10.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
++dependencies = [
++ "cfg-if 1.0.0",
++ "serde 1.0.118",
++ "serde_json",
++ "wasm-bindgen-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
++dependencies = [
++ "bumpalo",
++ "lazy_static 1.4.0",
++ "log",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-futures"
++version = "0.4.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
++dependencies = [
++ "cfg-if 1.0.0",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.69"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
++
++[[package]]
++name = "web-sys"
++version = "0.3.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "winreg"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
++
++[[package]]
++name = "yaml-rust"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
++dependencies = [
++ "linked-hash-map 0.5.3",
++]
diff --git a/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix
new file mode 100644
index 0000000000..88e8ba6d0b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/netease-music-tui/default.nix
@@ -0,0 +1,28 @@
+{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "netease-music-tui";
+ version = "v0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "betta-cyber";
+ repo = "netease-music-tui";
+ rev = "${version}";
+ sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f";
+ };
+
+ cargoPatches = [ ./cargo-lock.patch ];
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ alsaLib openssl ];
+
+ cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l";
+ verifyCargoDeps = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/betta-cyber/netease-music-tui";
+ description = "netease cloud music terminal client by rust";
+ maintainers = with maintainers; [ vonfry ];
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix b/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix
new file mode 100644
index 0000000000..402d3f1b6f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }:
+
+stdenv.mkDerivation rec {
+ pname = "stochas";
+ version = "1.3.4";
+
+ src = fetchFromGitHub {
+ owner = "surge-synthesizer";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0b26mbj727dnygavz4kihnhmnnvwsr9l145w6kydq7bd7nwiw7lq";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2
+ ];
+
+ installPhase = ''
+ mkdir -p $out/lib/vst3
+ cp -r stochas_artefacts/Release/VST3/Stochas.vst3 $out/lib/vst3
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Probabilistic polyrhythmic sequencer plugin";
+ homepage = "https://stochas.org/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ magnetophon ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
index 605d810b3d..cbd156d78e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
@@ -1,4 +1,4 @@
-{ channel, pname, version, build, sha256Hash }:
+{ channel, pname, version, build ? null, sha256Hash }:
{ alsaLib
, bash
@@ -53,11 +53,13 @@
let
drvName = "android-studio-${channel}-${version}";
+ filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz";
+
androidStudio = stdenv.mkDerivation {
name = "${drvName}-unwrapped";
src = fetchurl {
- url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz";
+ url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}";
sha256 = sha256Hash;
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index d94ad07053..d1eb7e58ef 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -14,14 +14,13 @@ let
sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os=";
};
betaVersion = {
- version = "4.2.0.17"; # "Android Studio 4.2 Beta 1"
- build = "202.6987402";
- sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7";
+ version = "4.2.0.18"; # "Android Studio 4.2 Beta 2"
+ build = "202.7008469";
+ sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh";
};
latestVersion = { # canary & dev
- version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2"
- build = "202.7006259";
- sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5";
+ version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3"
+ sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
index af3f087dae..bcdff1eff1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
- version = "1.115.0";
+ version = "1.118.2";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
- sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8";
+ sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
};
patches = [
@@ -106,6 +106,7 @@ stdenv.mkDerivation rec {
Search and replace with RegEx. Extendable by Python plugins and themes.
'';
homepage = "http://www.uvviewsoft.com/cudatext/";
+ changelog = "http://uvviewsoft.com/cudatext/history.txt";
license = licenses.mpl20;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
index 02418d2584..fc82ec4b8d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
@@ -11,18 +11,18 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
- "rev": "2020.09.20",
- "sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x"
+ "rev": "2020.11.02",
+ "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
},
"ATSynEdit": {
"owner": "Alexey-T",
- "rev": "2020.10.12",
- "sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr"
+ "rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
+ "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
- "rev": "2020.10.11",
- "sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw"
+ "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
+ "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
},
"EControl": {
"owner": "Alexey-T",
@@ -36,8 +36,8 @@
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
- "rev": "2020.07.31",
- "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j"
+ "rev": "2020.10.23",
+ "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
},
"Emmet-Pascal": {
"owner": "Alexey-T",
@@ -51,7 +51,7 @@
},
"bgrabitmap": {
"owner": "bgrabitmap",
- "rev": "v11.2.4",
- "sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"
+ "rev": "v11.3.1",
+ "sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix b/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix
index cb7f7070b2..f4f2c53522 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/yakuake.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdoctools, extra-cmake-modules,
karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications,
- knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras
+ knotifyconfig, konsole, kparts, kwayland, kwindowsystem, qtx11extras
}:
mkDerivation {
@@ -9,7 +9,7 @@ mkDerivation {
buildInputs = [
karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications
- knotifyconfig kparts kwindowsystem qtx11extras
+ knotifyconfig kparts kwayland kwindowsystem qtx11extras
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
index 629f11865b..c35579def7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix
@@ -223,7 +223,7 @@ let
};
in
stdenv.mkDerivation rec {
- name = "k3s";
+ pname = "k3s";
version = k3sVersion;
# Important utilities used by the kubelet, see
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index b8279f22de..2992f28c58 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,19 +1,23 @@
{ stdenv, fetchFromGitHub, python3Packages, }:
python3Packages.buildPythonApplication rec {
- version = "0.9.7";
+ version = "0.9.8";
pname = "canto-daemon";
src = fetchFromGitHub {
owner = "themoken";
repo = "canto-next";
rev = "v${version}";
- sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
+ sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk";
};
propagatedBuildInputs = with python3Packages; [ feedparser ];
- meta = {
+ doCheck = false;
+
+ pythonImportsCheck = [ "canto_next" ];
+
+ meta = with stdenv.lib; {
description = "Daemon for the canto Atom/RSS feed reader";
longDescription = ''
Canto is an Atom/RSS feed reader for the console that is meant to be
@@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec {
and extensibility using the excellent Python programming language.
'';
homepage = "https://codezen.org/canto-ng/";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.devhell ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers;[ devhell ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
index c7554fc84b..ce13a4de8d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "mlarchive2maildir";
- version = "0.0.8";
+ version = "0.0.9";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp";
+ sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";
};
nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];
diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
new file mode 100644
index 0000000000..5cad364d24
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
@@ -0,0 +1,62 @@
+{ lib, stdenv, fetchFromGitHub
+, avahi
+, cups
+, gnutls
+, libjpeg
+, libpng
+, libusb1
+, pkg-config
+, withPAMSupport ? true, pam
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pappl";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "michaelrsweet";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ cups
+ libjpeg
+ libpng
+ libusb1
+ zlib
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+ # upstream mentions these are not needed for Mac
+ # see: https://github.com/michaelrsweet/pappl#requirements
+ avahi
+ gnutls
+ ] ++ lib.optionals withPAMSupport [
+ pam
+ ];
+
+ # testing requires some networking
+ # doCheck = true;
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/pappl-makeresheader --help
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "C-based framework/library for developing CUPS Printer Applications";
+ homepage = "https://github.com/michaelrsweet/pappl";
+ license = licenses.asl20;
+ platforms = platforms.linux; # should also work for darwin, but requires additional work
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
index a169116c29..b2223d1abb 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/soapyuhd/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkg-config
, uhd, boost, soapysdr
} :
-let
- version = "0.3.6";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "soapyuhd";
- inherit version;
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapyUHD";
rev = "soapy-uhd-${version}";
- sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7";
+ sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ uhd boost soapysdr ];
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
@@ -28,7 +25,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = "https://github.com/pothosware/SoapyAirspy";
description = "SoapySDR plugin for UHD devices";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ markuskowa ];
platforms = platforms.linux;
};
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
index d432e66a19..317a83371a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -1,11 +1,9 @@
{ stdenv, fetchFromGitLab, cmake, gfortran, perl
-, openblas, blas, lapack, hdf5-cpp, python3, texlive
+, openblas, hdf5-cpp, python3, texlive
, armadillo, openmpi, globalarrays, openssh
, makeWrapper, fetchpatch
} :
-assert blas.implementation == "openblas" && lapack.implementation == "openblas";
-
let
version = "20.10";
gitLabRev = "v${version}";
@@ -74,7 +72,7 @@ in stdenv.mkDerivation {
homepage = "https://gitlab.com/Molcas/OpenMolcas";
maintainers = [ maintainers.markuskowa ];
license = licenses.lgpl21;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
index 866b7efa42..c6d4401fde 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "13.6.1",
- "repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947",
+ "version": "13.7.1",
+ "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v13.6.1-ee",
+ "rev": "v13.7.1-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "13.6.1",
- "GITLAB_PAGES_VERSION": "1.30.0",
- "GITLAB_SHELL_VERSION": "13.13.0",
- "GITLAB_WORKHORSE_VERSION": "8.54.0"
+ "GITALY_SERVER_VERSION": "13.7.1",
+ "GITLAB_PAGES_VERSION": "1.32.0",
+ "GITLAB_SHELL_VERSION": "13.14.0",
+ "GITLAB_WORKHORSE_VERSION": "8.58.0"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index d8564dca87..0a7fcd7c26 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'rugged', '~> 0.28'
-gem 'github-linguist', '~> 7.11', require: 'linguist'
+gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
gem 'activesupport', '~> 6.0.3.3'
gem 'rdoc', '~> 6.0'
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index a633e067f0..eb5c86946d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
ffi (1.13.1)
gemojione (3.3.0)
json
- github-linguist (7.11.0)
+ github-linguist (7.12.1)
charlock_holmes (~> 0.7.7)
escape_utils (~> 1.2.0)
mini_mime (~> 1.0)
@@ -134,7 +134,7 @@ GEM
redis (4.1.3)
regexp_parser (1.8.1)
rexml (3.2.4)
- rouge (3.24.0)
+ rouge (3.26.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -197,7 +197,7 @@ DEPENDENCIES
activesupport (~> 6.0.3.3)
factory_bot
faraday (~> 1.0)
- github-linguist (~> 7.11)
+ github-linguist (~> 7.12)
gitlab-gollum-lib (~> 4.2.7.9)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.13.2)
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 57465f808d..e8c99198df 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -4,6 +4,18 @@
, libgit2, openssl, zlib, pcre, http-parser }:
let
+ # libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet.
+ # See https://github.com/NixOS/nixpkgs/pull/106909
+ libgit = libgit2.overrideAttrs (attrs: rec {
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "libgit2";
+ repo = "libgit2";
+ rev = "v${version}";
+ sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc";
+ };
+ });
+
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
@@ -21,17 +33,17 @@ let
};
};
in buildGoModule rec {
- version = "13.6.1";
+ version = "13.7.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y";
+ sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
};
- vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r";
+ vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
passthru = {
inherit rubyEnv;
@@ -39,7 +51,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
+ buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 9cdadec5d4..fe05c1d017 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -207,10 +207,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv";
+ sha256 = "08lnb04qmlz4arls3nr3ia0k8r1kcyn010fr5qvc2qddidckqk88";
type = "gem";
};
- version = "7.11.0";
+ version = "7.12.1";
};
github-markup = {
source = {
@@ -645,10 +645,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.24.0";
+ version = "3.26.0";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index e2dd35ff33..14f7ce0f81 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,12 +2,12 @@
buildGoModule rec {
pname = "gitlab-shell";
- version = "13.13.0";
+ version = "13.14.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
+ sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0";
};
buildInputs = [ ruby ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index a0f80533ca..e536d4fcbb 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "8.54.0";
+ version = "8.58.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz";
+ sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80";
};
- vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj";
+ vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";
buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index d60fefe29d..49d0841be3 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -66,7 +66,7 @@ gem 'attr_encrypted', '~> 3.1.0'
gem 'u2f', '~> 0.2.1'
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.10'
+gem 'validates_hostname', '~> 1.0.11'
gem 'rubyzip', '~> 2.0.0', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.6'
@@ -115,11 +115,11 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick', '~> 4.10.1'
# for backups
-gem 'fog-aws', '~> 3.5'
+gem 'fog-aws', '~> 3.7'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.11'
+gem 'fog-google', '~> 1.12'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
@@ -149,7 +149,7 @@ gem 'html-pipeline', '~> 2.12'
gem 'deckar01-task_list', '2.3.1'
gem 'gitlab-markup', '~> 1.7.1'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-gem 'commonmarker', '~> 0.20'
+gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3.0'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 6.1.2'
@@ -159,7 +159,8 @@ gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.25.0'
+gem 'asciidoctor-kroki', '~> 0.2.2', require: false
+gem 'rouge', '~> 3.26.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
gem 'nokogiri', '~> 1.10.9'
@@ -209,7 +210,7 @@ gem 'httparty', '~> 0.16.4'
gem 'rainbow', '~> 3.0'
# Progress bar
-gem 'ruby-progressbar'
+gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
gem 'settingslogic', '~> 2.0.9'
@@ -291,7 +292,6 @@ gem 'sassc-rails', '~> 2.1.0'
gem 'terser', '1.0.2'
gem 'addressable', '~> 2.7'
-gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
gem 'request_store', '~> 1.5'
@@ -311,7 +311,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.13.1'
+gem 'gitlab-labkit', '0.13.3'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
@@ -351,6 +351,7 @@ group :development do
end
group :development, :test do
+ gem 'deprecation_toolkit', '~> 1.5.1', require: false
gem 'bullet', '~> 6.1.0'
gem 'pry-byebug', '~> 3.9.0', platform: :mri
gem 'pry-rails', '~> 0.3.9'
@@ -370,7 +371,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
- gem 'gitlab-styles', '~> 5.1.0', require: false
+ gem 'gitlab-styles', '~> 5.3.0', require: false
gem 'scss_lint', '~> 0.59.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
@@ -428,7 +429,7 @@ end
gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@@ -464,7 +465,7 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.5.0-rc2'
+gem 'gitaly', '~> 13.7.0.pre.rc1'
gem 'grpc', '~> 1.30.2'
@@ -477,6 +478,7 @@ gem 'flipper', '~> 0.17.1'
gem 'flipper-active_record', '~> 0.17.1'
gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
+gem 'gitlab-experiment', '~> 0.4.4'
# Structured logging
gem 'lograge', '~> 0.5'
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 64179847dd..1cd90080fd 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -84,6 +84,8 @@ GEM
asciidoctor (2.0.10)
asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0)
+ asciidoctor-kroki (0.2.2)
+ asciidoctor (~> 2.0)
asciidoctor-plantuml (0.0.12)
asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.1)
@@ -177,7 +179,7 @@ GEM
open4 (~> 1.3)
coderay (1.1.3)
colored2 (3.1.2)
- commonmarker (0.20.1)
+ commonmarker (0.21.0)
ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
@@ -220,10 +222,12 @@ GEM
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.3.1)
html-pipeline
- declarative (0.0.10)
+ declarative (0.0.20)
declarative-option (0.1.0)
default_value_for (3.3.0)
activerecord (>= 3.2.0, < 6.1)
+ deprecation_toolkit (1.5.1)
+ activesupport (>= 4.2)
derailed_benchmarks (1.7.0)
benchmark-ips (~> 2)
get_process_mem (~> 0)
@@ -359,7 +363,7 @@ GEM
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
- fog-aws (3.5.2)
+ fog-aws (3.7.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
@@ -369,11 +373,11 @@ GEM
excon (~> 0.58)
formatador (~> 0.2)
mime-types
- fog-google (1.11.0)
+ fog-google (1.12.0)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
- google-api-client (>= 0.32, < 0.34)
+ google-api-client (>= 0.44.2, < 0.51)
google-cloud-env (~> 1.2)
fog-json (1.2.0)
fog-core
@@ -392,8 +396,6 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
- font-awesome-rails (4.7.0.5)
- railties (>= 3.2, < 6.1)
formatador (0.2.5)
fugit (1.2.1)
et-orbi (~> 1.1, >= 1.1.8)
@@ -418,11 +420,14 @@ GEM
rails (>= 3.2.0)
git (1.7.0)
rchardet (~> 1.8)
- gitaly (13.5.0.pre.rc2)
+ gitaly (13.7.0.pre.rc1)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
+ gitlab-experiment (0.4.4)
+ activesupport (>= 3.0)
+ scientist (~> 1.5, >= 1.5.0)
gitlab-fog-azure-rm (1.0.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
@@ -430,15 +435,16 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
- gitlab-labkit (0.13.1)
+ gitlab-labkit (0.13.3)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
+ gitlab-pg_query (~> 1.3)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0)
- gitlab-mail_room (0.0.7)
+ gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.0)
@@ -449,7 +455,7 @@ GEM
gitlab-puma (>= 2.7, < 5)
gitlab-sidekiq-fetcher (0.5.2)
sidekiq (~> 5)
- gitlab-styles (5.1.0)
+ gitlab-styles (5.3.0)
rubocop (~> 0.89.1)
rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.8.1)
@@ -468,20 +474,21 @@ GEM
actionpack (>= 3.0)
multi_json
request_store (>= 1.0)
- google-api-client (0.33.2)
+ google-api-client (0.50.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
+ rexml
signet (~> 0.12)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-protobuf (3.12.4)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
- googleauth (0.12.0)
+ googleauth (0.14.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
@@ -691,7 +698,7 @@ GEM
marginalia (1.9.0)
actionpack (>= 2.3)
activerecord (>= 2.3)
- memoist (0.16.0)
+ memoist (0.16.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
memory_profiler (0.9.14)
@@ -832,7 +839,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
- os (1.0.0)
+ os (1.1.1)
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
@@ -977,7 +984,7 @@ GEM
rexml (3.2.4)
rinku (2.0.0)
rotp (2.1.2)
- rouge (3.25.0)
+ rouge (3.26.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
@@ -1041,7 +1048,7 @@ GEM
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
- ruby-enum (0.7.2)
+ ruby-enum (0.8.0)
i18n
ruby-fogbugz (0.2.1)
crack (~> 0.4)
@@ -1081,6 +1088,7 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
+ scientist (1.5.0)
scss_lint (0.59.0)
sass (~> 3.5, >= 3.5.5)
securecompare (1.0.0)
@@ -1215,7 +1223,7 @@ GEM
validate_url (1.0.8)
activemodel (>= 3.0.0)
public_suffix
- validates_hostname (1.0.10)
+ validates_hostname (1.0.11)
activerecord (>= 3.0)
activesupport (>= 3.0)
version_sorter (2.2.4)
@@ -1267,6 +1275,7 @@ DEPENDENCIES
asana (= 0.10.2)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)
+ asciidoctor-kroki (~> 0.2.2)
asciidoctor-plantuml (~> 0.0.12)
atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0)
@@ -1292,7 +1301,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
- commonmarker (~> 0.20)
+ commonmarker (~> 0.21)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
countries (~> 3.0)
@@ -1302,6 +1311,7 @@ DEPENDENCIES
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1)
default_value_for (~> 3.3.0)
+ deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
device_detector
devise (~> 4.7.2)
@@ -1329,33 +1339,33 @@ DEPENDENCIES
flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
- fog-aws (~> 3.5)
+ fog-aws (~> 3.7)
fog-core (= 2.1.0)
- fog-google (~> 1.11)
+ fog-google (~> 1.12)
fog-local (~> 0.6)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
- font-awesome-rails (~> 4.7)
fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.3)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 13.5.0.pre.rc2)
+ gitaly (~> 13.7.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
+ gitlab-experiment (~> 0.4.4)
gitlab-fog-azure-rm (~> 1.0)
- gitlab-labkit (= 0.13.1)
+ gitlab-labkit (= 0.13.3)
gitlab-license (~> 1.0)
- gitlab-mail_room (~> 0.0.7)
+ gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-pg_query (~> 1.3)
gitlab-puma (~> 4.3.3.gitlab.2)
gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
gitlab-sidekiq-fetcher (= 0.5.2)
- gitlab-styles (~> 5.1.0)
+ gitlab-styles (~> 5.3.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
@@ -1468,7 +1478,7 @@ DEPENDENCIES
request_store (~> 1.5)
responders (~> 3.0)
retriable (~> 3.1.2)
- rouge (~> 3.25.0)
+ rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
rspec-rails (~> 4.0.0)
@@ -1477,7 +1487,7 @@ DEPENDENCIES
rspec_profiling (~> 0.0.6)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 1.3.0)
- ruby-progressbar
+ ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15)
rubyzip (~> 2.0.0)
rugged (~> 0.28)
@@ -1515,7 +1525,7 @@ DEPENDENCIES
unicorn-worker-killer (~> 0.4.4)
unleash (~> 0.1.5)
valid_email (~> 0.1)
- validates_hostname (~> 1.0.10)
+ validates_hostname (~> 1.0.11)
version_sorter (~> 2.2.4)
vmstat (~> 2.3.0)
webauthn (~> 2.3)
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 651b418234..ebb3fe5b74 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -258,6 +258,17 @@
};
version = "0.3.1";
};
+ asciidoctor-kroki = {
+ dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5";
+ type = "gem";
+ };
+ version = "0.2.2";
+ };
asciidoctor-plantuml = {
dependencies = ["asciidoctor"];
groups = ["default"];
@@ -762,10 +773,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461";
+ sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr";
type = "gem";
};
- version = "0.20.1";
+ version = "0.21.0";
};
concord = {
dependencies = ["adamantium" "equalizer"];
@@ -955,10 +966,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
+ sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
type = "gem";
};
- version = "0.0.10";
+ version = "0.0.20";
};
declarative-option = {
groups = ["default"];
@@ -981,6 +992,17 @@
};
version = "3.3.0";
};
+ deprecation_toolkit = {
+ dependencies = ["activesupport"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8";
+ type = "gem";
+ };
+ version = "1.5.1";
+ };
derailed_benchmarks = {
dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"];
groups = ["default"];
@@ -1590,10 +1612,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4";
+ sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn";
type = "gem";
};
- version = "3.5.2";
+ version = "3.7.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador" "mime-types"];
@@ -1612,10 +1634,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f";
+ sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4";
type = "gem";
};
- version = "1.11.0";
+ version = "1.12.0";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
@@ -1672,17 +1694,6 @@
};
version = "0.1.3";
};
- font-awesome-rails = {
- dependencies = ["railties"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz";
- type = "gem";
- };
- version = "4.7.0.5";
- };
formatador = {
groups = ["default"];
platforms = [];
@@ -1797,10 +1808,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m";
+ sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq";
type = "gem";
};
- version = "13.5.0.pre.rc2";
+ version = "13.7.0.pre.rc1";
};
github-markup = {
groups = ["default"];
@@ -1823,6 +1834,17 @@
};
version = "0.10.5";
};
+ gitlab-experiment = {
+ dependencies = ["activesupport" "scientist"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi";
+ type = "gem";
+ };
+ version = "0.4.4";
+ };
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
groups = ["default"];
@@ -1835,15 +1857,15 @@
version = "1.0.0";
};
gitlab-labkit = {
- dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
+ dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40";
+ sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803";
type = "gem";
};
- version = "0.13.1";
+ version = "0.13.3";
};
gitlab-license = {
groups = ["default"];
@@ -1860,10 +1882,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin";
+ sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir";
type = "gem";
};
- version = "0.0.7";
+ version = "0.0.8";
};
gitlab-markup = {
groups = ["default"];
@@ -1934,10 +1956,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3";
+ sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh";
type = "gem";
};
- version = "5.1.0";
+ version = "5.3.0";
};
gitlab_chronic_duration = {
dependencies = ["numerizer"];
@@ -1984,15 +2006,15 @@
version = "6.2.0";
};
google-api-client = {
- dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+ dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq";
+ sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s";
type = "gem";
};
- version = "0.33.2";
+ version = "0.50.0";
};
google-cloud-env = {
dependencies = ["faraday"];
@@ -2032,10 +2054,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh";
+ sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6";
type = "gem";
};
- version = "0.12.0";
+ version = "0.14.0";
};
gpgme = {
dependencies = ["mini_portile2"];
@@ -2854,10 +2876,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
+ sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
type = "gem";
};
- version = "0.16.0";
+ version = "0.16.2";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -3562,10 +3584,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
+ sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.1";
};
parallel = {
groups = ["development" "test"];
@@ -4250,10 +4272,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
+ sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
type = "gem";
};
- version = "3.25.0";
+ version = "3.26.0";
};
rqrcode = {
dependencies = ["chunky_png"];
@@ -4458,10 +4480,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
+ sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw";
type = "gem";
};
- version = "0.7.2";
+ version = "0.8.0";
};
ruby-fogbugz = {
dependencies = ["crack"];
@@ -4663,6 +4685,16 @@
};
version = "0.8.2";
};
+ scientist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
scss_lint = {
dependencies = ["sass"];
groups = ["development" "test"];
@@ -5374,10 +5406,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy";
+ sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm";
type = "gem";
};
- version = "1.0.10";
+ version = "1.0.11";
};
version_sorter = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py
index 0f215370e1..f662bd3097 100755
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix
+#! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix
import click
import click_log
@@ -83,10 +83,10 @@ def _get_data_json():
return json.load(f)
-def _call_update_source_version(pkg, version):
- """calls update-source-version from nixpkgs root dir"""
+def _call_nix_update(pkg, version):
+ """calls nix-update from nixpkgs root dir"""
nixpkgs_path = pathlib.Path(__file__).parent / '../../../../'
- return subprocess.check_output(['update-source-version', pkg, version], cwd=nixpkgs_path)
+ return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path)
@click_log.simple_verbosity_option(logger)
@@ -168,20 +168,10 @@ def update_gitaly():
with open(gitaly_dir / fn, 'w') as f:
f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
- for fn in ['go.mod', 'go.sum']:
- with open(gitaly_dir / fn, 'w') as f:
- f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
-
subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir)
subprocess.check_output(['bundix'], cwd=gitaly_dir)
- os.environ['GOROOT'] = ""
- subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir)
-
- for fn in ['go.mod', 'go.sum']:
- os.unlink(gitaly_dir / fn)
-
- _call_update_source_version('gitaly', gitaly_server_version)
+ _call_nix_update('gitaly', gitaly_server_version)
@cli.command('update-gitlab-shell')
@@ -189,42 +179,22 @@ def update_gitlab_shell():
"""Update gitlab-shell"""
data = _get_data_json()
gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION']
- _call_update_source_version('gitlab-shell', gitlab_shell_version)
+ _call_nix_update('gitlab-shell', gitlab_shell_version)
repo = GitLabRepo(repo='gitlab-shell')
gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell'
- for fn in ['go.mod', 'go.sum']:
- with open(gitlab_shell_dir / fn, 'w') as f:
- f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
-
- os.environ['GOROOT'] = ""
- subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir)
-
- for fn in ['go.mod', 'go.sum']:
- os.unlink(gitlab_shell_dir / fn)
-
@cli.command('update-gitlab-workhorse')
def update_gitlab_workhorse():
"""Update gitlab-workhorse"""
data = _get_data_json()
gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
- _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version)
+ _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
repo = GitLabRepo('gitlab-org', 'gitlab-workhorse')
gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse'
- for fn in ['go.mod', 'go.sum']:
- with open(gitlab_workhorse_dir / fn, 'w') as f:
- f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
-
- os.environ['GOROOT'] = ""
- subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir)
-
- for fn in ['go.mod', 'go.sum']:
- os.unlink(gitlab_workhorse_dir / fn)
-
@cli.command('update-all')
@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
@click.pass_context
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index ca504fc231..ba24888d95 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -786,19 +786,27 @@
};
}
{
- name = "_gitlab_svgs___svgs_1.175.0.tgz";
+ name = "_gitlab_svgs___svgs_1.177.0.tgz";
path = fetchurl {
- name = "_gitlab_svgs___svgs_1.175.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz";
- sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d";
+ name = "_gitlab_svgs___svgs_1.177.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz";
+ sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5";
};
}
{
- name = "_gitlab_ui___ui_23.9.0.tgz";
+ name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
path = fetchurl {
- name = "_gitlab_ui___ui_23.9.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz";
- sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b";
+ name = "_gitlab_tributejs___tributejs_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz";
+ sha1 = "672befa222aeffc83e7d799b0500a7a4418e59b8";
+ };
+ }
+ {
+ name = "_gitlab_ui___ui_24.8.1.tgz";
+ path = fetchurl {
+ name = "_gitlab_ui___ui_24.8.1.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz";
+ sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7";
};
}
{
@@ -1026,19 +1034,19 @@
};
}
{
- name = "_toast_ui_editor___editor_2.5.0.tgz";
+ name = "_toast_ui_editor___editor_2.5.1.tgz";
path = fetchurl {
- name = "_toast_ui_editor___editor_2.5.0.tgz";
- url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz";
- sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1";
+ name = "_toast_ui_editor___editor_2.5.1.tgz";
+ url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz";
+ sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7";
};
}
{
- name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
+ name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
path = fetchurl {
- name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
- url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz";
- sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee";
+ name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
+ url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz";
+ sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc";
};
}
{
@@ -4394,11 +4402,11 @@
};
}
{
- name = "dompurify___dompurify_2.2.2.tgz";
+ name = "dompurify___dompurify_2.2.4.tgz";
path = fetchurl {
- name = "dompurify___dompurify_2.2.2.tgz";
- url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz";
- sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972";
+ name = "dompurify___dompurify_2.2.4.tgz";
+ url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz";
+ sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410";
};
}
{
@@ -7433,6 +7441,14 @@
sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c";
};
}
+ {
+ name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz";
+ path = fetchurl {
+ name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz";
+ sha1 = "ce9f56d54650f157c4a7d16d224ba5d613bcd626";
+ };
+ }
{
name = "jest_regex_util___jest_regex_util_26.0.0.tgz";
path = fetchurl {
@@ -8938,11 +8954,11 @@
};
}
{
- name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz";
+ name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz";
path = fetchurl {
- name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz";
- url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz";
- sha1 = "556a6090b1816dbf07e51093b652aca84aee979e";
+ name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz";
+ url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz";
+ sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922";
};
}
{
@@ -12657,14 +12673,6 @@
sha1 = "03273586def1595ae08fedb38d7733cee91d2479";
};
}
- {
- name = "tributejs___tributejs_5.1.3.tgz";
- path = fetchurl {
- name = "tributejs___tributejs_5.1.3.tgz";
- url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz";
- sha1 = "980600fc72865be5868893078b4bfde721129eae";
- };
- }
{
name = "trim_newlines___trim_newlines_1.0.0.tgz";
path = fetchurl {
@@ -13466,19 +13474,19 @@
};
}
{
- name = "vue_loader___vue_loader_15.9.3.tgz";
+ name = "vue_loader___vue_loader_15.9.5.tgz";
path = fetchurl {
- name = "vue_loader___vue_loader_15.9.3.tgz";
- url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz";
- sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda";
+ name = "vue_loader___vue_loader_15.9.5.tgz";
+ url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz";
+ sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706";
};
}
{
- name = "vue_router___vue_router_3.4.5.tgz";
+ name = "vue_router___vue_router_3.4.9.tgz";
path = fetchurl {
- name = "vue_router___vue_router_3.4.5.tgz";
- url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz";
- sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175";
+ name = "vue_router___vue_router_3.4.9.tgz";
+ url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz";
+ sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66";
};
}
{
@@ -13538,11 +13546,11 @@
};
}
{
- name = "vuex___vuex_3.5.1.tgz";
+ name = "vuex___vuex_3.6.0.tgz";
path = fetchurl {
- name = "vuex___vuex_3.5.1.tgz";
- url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz";
- sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d";
+ name = "vuex___vuex_3.6.0.tgz";
+ url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz";
+ sha1 = "95efa56a58f7607c135b053350833a09e01aa813";
};
}
{
diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
index 08b78ec400..31438a1fc7 100644
--- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
@@ -28,7 +28,7 @@ mkXfceDerivation {
# Fix build with libical 3.0
(fetchpatch {
name = "fix-libical3.patch";
- url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10";
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];
diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
index 58716d3717..130387a97b 100644
--- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix
@@ -46,7 +46,7 @@ with builtins;
let
args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ];
- go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = {
+ go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules";
@@ -119,7 +119,7 @@ let
}
) // overrideModAttrs modArgs) else "";
- package = go.stdenv.mkDerivation (args // {
+ package = stdenv.mkDerivation (args // {
nativeBuildInputs = [ go ] ++ nativeBuildInputs;
inherit (go) GOOS GOARCH;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix
new file mode 100644
index 0000000000..9912032c77
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix
@@ -0,0 +1,15 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "1.75.0";
+
+ src = fetchurl {
+ urls = [
+ "mirror://sourceforge/boost/boost_1_75_0.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2"
+ ];
+ # SHA256 from http://www.boost.org/users/history/version_1_75_0.html
+ sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";
+ };
+})
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
new file mode 100644
index 0000000000..35e12eb00c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/entt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+ pname = "entt";
+ version = "3.5.2";
+
+ src = fetchFromGitHub {
+ owner = "skypjack";
+ repo = "entt";
+ rev = "v${version}";
+ sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/skypjack/entt";
+ description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";
+ maintainers = with maintainers; [ twey ];
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
index 6654cc563d..48ef98dab4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "ntirpc";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "ntirpc";
rev = "v${version}";
- sha256 = "08vc2z9sl1p9mk1mx0zn4xv7dw12gamhciy41fbavm90iavf3vqm";
+ sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
index 9911c3e68c..cd8c90f319 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
@@ -1,53 +1,69 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
-, gobject-introspection, glib, systemd, libgudev, vala
-, usbutils, which, python3 }:
+{ stdenv
+, docbook_xsl
+, fetchurl
+, glib
+, gobject-introspection
+, gtk-doc
+, libgudev
+, meson
+, ninja
+, pkg-config
+, python3
+, systemd
+, usbutils
+, vala
+, which
+}:
stdenv.mkDerivation rec {
pname = "umockdev";
- version = "0.13.1";
+ version = "0.15.2";
outputs = [ "bin" "out" "dev" "doc" ];
src = fetchurl {
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
- sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla";
+ sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52";
};
- patches = [
- ./fix-test-paths.patch
- # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461
- ./disable-failed-test.patch
- # https://github.com/martinpitt/umockdev/pull/93
- (fetchpatch {
- url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch";
- sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx";
- })
+ mesonFlags = [
+ "-Dgtk_doc=true"
];
- # autoreconfHook complains if we try to build the documentation
- postPatch = ''
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- '';
-
preCheck = ''
patchShebangs tests/test-static-code
'';
buildInputs = [ glib systemd libgudev ];
- nativeBuildInputs = [ pkgconfig vala gobject-introspection ];
+ nativeBuildInputs = [
+ docbook_xsl
+ gobject-introspection
+ gtk-doc
+ meson
+ ninja
+ pkg-config
+ vala
+ ];
checkInputs = [ python3 which usbutils ];
enableParallelBuilding = true;
# Test fail with libusb 1.0.24
+ # https://github.com/NixOS/nixpkgs/issues/107420
+ # https://github.com/martinpitt/umockdev/issues/115
doCheck = false;
+ postInstall = ''
+ mkdir -p $doc/share/doc/umockdev/
+ mv docs/reference $doc/share/doc/umockdev/
+ '';
+
meta = with stdenv.lib; {
description = "Mock hardware devices for creating unit tests";
license = licenses.lgpl2;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ flokli ];
platforms = with platforms; linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
index f3ec383fdd..55f950e0ac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/7.x.nix
@@ -1,74 +1,9 @@
-{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
-, fetchpatch
-, qtLib ? null
-, enablePython ? false, python ? null
-# Darwin support
-, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
-, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
-
-with stdenv.lib;
-
-let
- os = stdenv.lib.optionalString;
+import ./generic.nix {
majorVersion = "7.1";
minorVersion = "1";
- version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
- name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
- src = fetchurl {
- url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
- sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
- };
-
- patches = [
- (fetchpatch {
- url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
- sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
- })
- ];
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ libtiff ]
- ++ optional (qtLib != null) qtLib
- ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
- ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
- CFNetwork Security ApplicationServices CoreText
- IOSurface ImageIO OpenGL GLUT ]
- ++ optional enablePython [
- python
- ];
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
-
- preBuild = ''
- export LD_LIBRARY_PATH="$(pwd)/lib";
- '';
-
- # Shared libraries don't work, because of rpath troubles with the current
- # nixpkgs cmake approach. It wants to call a binary at build time, just
- # built and requiring one of the shared objects.
- # At least, we use -fPIC for other packages to be able to use this in shared
- # objects.
- cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
- ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
- ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
- ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
-
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "Open source libraries for 3D computer graphics, image processing and visualization";
- homepage = "https://www.vtk.org/";
- license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
- platforms = with stdenv.lib.platforms; unix;
- };
+ sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
+ patchesToFetch = [{
+ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
+ sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
+ }];
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/8.x.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/8.x.nix
new file mode 100644
index 0000000000..1563991f47
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/8.x.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+ majorVersion = "8.2";
+ minorVersion = "0";
+ sourceSha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
+ patchesToFetch = [{
+ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff";
+ sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy";
+ }];
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix
index 455431ec34..e99ba34999 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix
@@ -1,95 +1,5 @@
-{ stdenv, mkDerivation, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
-, fetchpatch
-, enableQt ? false, qtbase, qtx11extras, qttools
-, enablePython ? false, python ? null
-# Darwin support
-, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
-, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
-
-with stdenv.lib;
-
-let
- os = stdenv.lib.optionalString;
+import ./generic.nix {
majorVersion = "9.0";
minorVersion = "1";
- version = "${majorVersion}.${minorVersion}";
-in
-
-mkDerivation rec {
- name = "vtk-${os enableQt "qvtk-"}${version}";
- src = fetchurl {
- url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
- sha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v";
- };
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ libtiff ]
- ++ optionals enableQt [ qtbase qtx11extras qttools ]
- ++ optionals stdenv.isLinux [
- libGLU
- libGL
- libX11
- xorgproto
- libXt
- ] ++ optionals stdenv.isDarwin [
- xpc
- Cocoa
- CoreServices
- DiskArbitration
- IOKit
- CFNetwork
- Security
- ApplicationServices
- CoreText
- IOSurface
- ImageIO
- OpenGL
- GLUT
- ]
- ++ optional enablePython [
- python
- ];
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
-
- preBuild = ''
- export LD_LIBRARY_PATH="$(pwd)/lib";
- '';
-
- # Shared libraries don't work, because of rpath troubles with the current
- # nixpkgs cmake approach. It wants to call a binary at build time, just
- # built and requiring one of the shared objects.
- # At least, we use -fPIC for other packages to be able to use this in shared
- # objects.
- cmakeFlags = [
- "-DCMAKE_C_FLAGS=-fPIC"
- "-DCMAKE_CXX_FLAGS=-fPIC"
- "-DVTK_USE_SYSTEM_TIFF=1"
- "-DOPENGL_INCLUDE_DIR=${libGL}/include"
- "-DCMAKE_INSTALL_LIBDIR=lib"
- "-DCMAKE_INSTALL_INCLUDEDIR=include"
- "-DCMAKE_INSTALL_BINDIR=bin"
- ]
- ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ]
- ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
- ++ optionals enablePython [
- "-DVTK_WRAP_PYTHON:BOOL=ON"
- "-DVTK_PYTHON_VERSION:STRING=3"
- ];
-
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "Open source libraries for 3D computer graphics, image processing and visualization";
- homepage = "https://www.vtk.org/";
- license = licenses.bsd3;
- maintainers = with maintainers; [ tfmoraes ];
- platforms = with platforms; unix;
- };
+ sourceSha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix
deleted file mode 100644
index 114c5d1939..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/vtk/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
-, fetchpatch
-, qtLib ? null
-, enablePython ? false, python ? null
-# Darwin support
-, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
-, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }:
-
-with stdenv.lib;
-
-let
- os = stdenv.lib.optionalString;
- majorVersion = "8.2";
- minorVersion = "0";
- version = "${majorVersion}.${minorVersion}";
-in
-
-stdenv.mkDerivation rec {
- name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
- src = fetchurl {
- url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
- sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl";
- };
-
- patches = [
- # Fix compilation with Qt 5.15
- (fetchpatch {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch?id=3ca9613d7ad604c93d714e29b116952561e4e41c";
- sha256 = "sha256-BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds=";
- })
- ];
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ libtiff ]
- ++ optionals (qtLib != null) (with qtLib; [ qtbase qtx11extras qttools ])
- ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ]
- ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
- CFNetwork Security ApplicationServices CoreText
- IOSurface ImageIO OpenGL GLUT ]
- ++ optional enablePython [
- python
- ];
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ];
-
- preBuild = ''
- export LD_LIBRARY_PATH="$(pwd)/lib";
- '';
-
- # Shared libraries don't work, because of rpath troubles with the current
- # nixpkgs cmake approach. It wants to call a binary at build time, just
- # built and requiring one of the shared objects.
- # At least, we use -fPIC for other packages to be able to use this in shared
- # objects.
- cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
- ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
- ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
- ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
-
- postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
- sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
- '';
-
- enableParallelBuilding = true;
-
- meta = {
- description = "Open source libraries for 3D computer graphics, image processing and visualization";
- homepage = "https://www.vtk.org/";
- license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
- platforms = with stdenv.lib.platforms; unix;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
new file mode 100644
index 0000000000..7bfd8d9fcf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix
@@ -0,0 +1,96 @@
+{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
+{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
+, fetchpatch
+, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
+, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
+# Darwin support
+, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
+, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc
+}:
+
+let
+ inherit (lib) optionalString optionals optional;
+
+ pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion;
+
+in stdenv.mkDerivation rec {
+ pname = "vtk${optionalString enableQt "-qvtk"}";
+ version = "${majorVersion}.${minorVersion}";
+
+ src = fetchurl {
+ url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
+ sha256 = sourceSha256;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ libtiff ]
+ ++ optionals enableQt [ qtbase qtx11extras qttools ]
+ ++ optionals stdenv.isLinux [
+ libGLU
+ libGL
+ libX11
+ xorgproto
+ libXt
+ ] ++ optionals stdenv.isDarwin [
+ xpc
+ Cocoa
+ CoreServices
+ DiskArbitration
+ IOKit
+ CFNetwork
+ Security
+ ApplicationServices
+ CoreText
+ IOSurface
+ ImageIO
+ OpenGL
+ GLUT
+ ] ++ optional enablePython [
+ pythonInterpreter
+ ];
+ propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ];
+
+ patches = map fetchpatch patchesToFetch;
+
+ preBuild = ''
+ export LD_LIBRARY_PATH="$(pwd)/lib";
+ '';
+
+ # Shared libraries don't work, because of rpath troubles with the current
+ # nixpkgs cmake approach. It wants to call a binary at build time, just
+ # built and requiring one of the shared objects.
+ # At least, we use -fPIC for other packages to be able to use this in shared
+ # objects.
+ cmakeFlags = [
+ "-DCMAKE_C_FLAGS=-fPIC"
+ "-DCMAKE_CXX_FLAGS=-fPIC"
+ "-DVTK_USE_SYSTEM_TIFF=1"
+ "-DOPENGL_INCLUDE_DIR=${libGL}/include"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ "-DCMAKE_INSTALL_BINDIR=bin"
+ ]
+ ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ]
+ ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
+ ++ optionals enablePython [
+ "-DVTK_WRAP_PYTHON:BOOL=ON"
+ "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}"
+ ];
+
+ postPatch = optionalString stdenv.isDarwin ''
+ sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
+ sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
+ sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "Open source libraries for 3D computer graphics, image processing and visualization";
+ homepage = "https://www.vtk.org/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix
new file mode 100644
index 0000000000..1d6dcdc67a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/xed/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+let
+ # mbuild is a custom build system used only to build xed
+ mbuild = python3Packages.buildPythonPackage rec {
+ pname = "mbuild";
+ version = "0.2496-dev";
+
+ src = fetchFromGitHub {
+ owner = "intelxed";
+ repo = "mbuild";
+ rev = "3e8eb33aada4153c21c4261b35e5f51f6e2019e8";
+ sha256 = "0yamgzkzw4v6x1a857psw9f7i62ydgd0zaqrf33dbdg8hfd2mq3q";
+ };
+ };
+
+in stdenv.mkDerivation rec {
+ pname = "xed";
+ version = "12.0.1";
+
+ src = fetchFromGitHub {
+ owner = "intelxed";
+ repo = "xed";
+ rev = version;
+ sha256 = "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f";
+ };
+
+ nativeBuildInputs = [ mbuild ];
+
+ buildPhase = ''
+ patchShebangs mfile.py
+
+ # this will build, test and install
+ ./mfile.py test --prefix $out
+ '';
+
+ dontInstall = true; # already installed during buildPhase
+
+ meta = with stdenv.lib; {
+ description = "Intel X86 Encoder Decoder (Intel XED)";
+ homepage = "https://intelxed.github.io/";
+ license = licenses.apsl20;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ arturcygan ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
index 4de8eaba3d..803f642406 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "PyMySQL>=0.9,<=0.9.2" "PyMySQL"
+ --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL"
'';
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 51b66ef951..6633657d18 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.14.0";
+ version = "0.15.0";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "0k5dhhlypilpa7h6ncqldvc14bv70c8mb2bbj7vyzfwahy57zb29";
+ sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix
index 420a57c07d..86a2bd8aa8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ciscomobilityexpress/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ciscomobilityexpress";
- version = "0.3.9";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0kj0i1963afxqw9apk0yxzj1f7kpi1949ggnkzkb8v90kxpgymma";
+ sha256 = "fd3fe893d8a44f5ac1d46580af88e07f1066e73744763aca4ef2226f87d575ff";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
index 3ae2142181..2e0039b231 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
@@ -14,6 +14,7 @@
, python-baseconv
, pyyaml
, uvicorn
+, httpx
# Check Inputs
, pytestCheckHook
, pytestrunner
@@ -26,13 +27,13 @@
buildPythonPackage rec {
pname = "datasette";
- version = "0.46";
+ version = "0.53";
src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
- sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq";
+ sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz";
};
nativeBuildInputs = [ pytestrunner ];
@@ -52,6 +53,8 @@ buildPythonPackage rec {
pyyaml
uvicorn
setuptools
+ httpx
+ asgiref
];
checkInputs = [
@@ -59,7 +62,6 @@ buildPythonPackage rec {
pytest-asyncio
aiohttp
beautifulsoup4
- asgiref
];
postConfigure = ''
@@ -75,9 +77,9 @@ buildPythonPackage rec {
# takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews
# with pytest-xdist, it still takes around 10mins with 32 cores
- # just run the messages tests, as this should give some indictation of correctness
+ # just run the csv tests, as this should give some indictation of correctness
pytestFlagsArray = [
- "tests/test_messages.py"
+ "tests/test_csv.py"
];
disabledTests = [
"facet"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index e3e48bda68..bdf7c21514 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-storages";
- version = "1.11";
+ version = "1.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7af56611c62a1c174aab4e862efb7fdd98296dccf76f42135f5b6851fc313c97";
+ sha256 = "c823dbf56c9e35b0999a13d7e05062b837bae36c518a40255d522fbe3750fbb4";
};
propagatedBuildInputs = [ django ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
index 303d6d95a4..3f5371e397 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix
@@ -2,19 +2,18 @@
, buildPythonPackage
, fetchPypi
, django
-, six
}:
buildPythonPackage rec {
pname = "django-contrib-comments";
- version = "1.9.2";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31";
+ sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9";
};
- propagatedBuildInputs = [ django six ];
+ propagatedBuildInputs = [ django ];
meta = with stdenv.lib; {
homepage = "https://github.com/django/django-contrib-comments";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
index feb3766067..24e2e6343a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-Testing";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1rkkqgmrzmhpv6y1xysqh0ij03xniic8h631yvghksqwxd9vyjfq";
+ sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
index a1433d08bd..cd91eb08be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
@@ -12,6 +12,7 @@
, sympy
, matplotlib
, reportlab
+, sphinx
, pytest
, pytest-randomly
, glibcLocales
@@ -19,14 +20,14 @@
buildPythonPackage rec {
pname = "fonttools";
- version = "4.14.0";
+ version = "4.18.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in";
+ sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv";
};
# all dependencies are optional, but
@@ -53,6 +54,7 @@ buildPythonPackage rec {
matplotlib
# pens
reportlab
+ sphinx
];
preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix
index 9048166773..9345573e9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/macropy/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, python
, isPy27
+, pythonAtLeast
, pinqSupport ? false, sqlalchemy
, pyxlSupport ? false, pyxl3
}:
@@ -34,5 +35,6 @@ buildPythonPackage rec {
description = "Macros in Python: quasiquotes, case classes, LINQ and more";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
+ broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
index 9f54dba8b9..83f9c7a998 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix
@@ -2,6 +2,7 @@
, nixosTests
, buildPythonPackage
, fetchPypi
+, substituteAll
, pkgs
, argcomplete
, pyyaml
@@ -23,6 +24,13 @@ buildPythonPackage rec {
sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
};
+ patches = [
+ (substituteAll {
+ src = ./jq-path.patch;
+ jq = "${lib.getBin pkgs.jq}/bin/jq";
+ })
+ ];
+
postPatch = ''
substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
'';
@@ -39,7 +47,6 @@ buildPythonPackage rec {
pytest
coverage
flake8
- pkgs.jq
toml
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch
new file mode 100644
index 0000000000..784a28feaf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/jq-path.patch
@@ -0,0 +1,26 @@
+diff --git a/test/test.py b/test/test.py
+index a81f41b..9e80f04 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -112,7 +112,7 @@ class TestYq(unittest.TestCase):
+ tf2.seek(0)
+ self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n')
+
+- @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
++ @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6")
+ def test_jq16_arg_passthrough(self):
+ self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]),
+ "a:\n- a\n- b\n")
+diff --git a/yq/__init__.py b/yq/__init__.py
+index afeb42c..a0d7970 100755
+--- a/yq/__init__.py
++++ b/yq/__init__.py
+@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma
+
+ try:
+ # Note: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us
+- jq = subprocess.Popen(["jq"] + list(jq_args),
++ jq = subprocess.Popen(["@jq@"] + list(jq_args),
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE if converting_output else None,
+ universal_newlines=True)
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index e10052203e..7d66264564 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,21 +2,21 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.27.0";
+ version = "0.36.10";
src = fetchFromGitHub {
- owner = "liamg";
+ owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv";
+ sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a";
};
- goPackagePath = "github.com/liamg/tfsec";
+ goPackagePath = "github.com/tfsec/tfsec";
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
meta = with lib; {
- homepage = "https://github.com/liamg/tfsec";
+ homepage = "https://github.com/tfsec/tfsec";
description = "Static analysis powered security scanner for your terraform code";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
index 163926f0e5..ee18a72216 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix
@@ -1,8 +1,8 @@
-{ lib, python3Packages, fetchpatch }:
+{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "litecli";
- version = "1.4.1";
+ version = "1.5.0";
# Python 2 won't have prompt_toolkit 2.x.x
# See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
@@ -10,17 +10,9 @@ python3Packages.buildPythonApplication rec {
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
+ sha256 = "b09f0804d26b018360b240778612390810e8e00ea0f79d5412fd0d4775c0e3cd";
};
- patches = [
- # Fix compatibility with sqlparse >= 0.4.0. Remove with the next release
- (fetchpatch {
- url = "https://github.com/dbcli/litecli/commit/37957e401d22f88800bbdec2c690e731f2cc13bd.patch";
- sha256 = "1x82s2h1rzflyiahyd8pfya30rzs6yx6ij4a4s16f8iix5x35zv9";
- })
- ];
-
propagatedBuildInputs = with python3Packages; [
cli-helpers
click
@@ -31,23 +23,17 @@ python3Packages.buildPythonApplication rec {
];
checkInputs = with python3Packages; [
- pytest
+ pytestCheckHook
mock
];
- preCheck = ''
- export XDG_CONFIG_HOME=$TMP
- # add missing file
- mkdir -p tests/data
- echo -e "t1,11\nt2,22\n" > tests/data/import_data.csv
- '';
-
meta = with lib; {
description = "Command-line interface for SQLite";
longDescription = ''
A command-line client for SQLite databases that has auto-completion and syntax highlighting.
'';
homepage = "https://litecli.com";
+ changelog = "https://github.com/dbcli/litecli/blob/v${version}/CHANGELOG.md";
license = licenses.bsd3;
maintainers = with maintainers; [ Scriptkiddi ];
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
index 36a85e6361..b4c26d6fb5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/pgcli/default.nix
@@ -1,52 +1,61 @@
-{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch
-, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2
-, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock
+{ stdenv
+, buildPythonApplication
+, fetchPypi
+, isPy3k
+, cli-helpers
+, click
+, configobj
+, humanize
+, prompt_toolkit
+, psycopg2
+, pygments
+, sqlparse
+, pgspecial
+, setproctitle
+, keyring
+, pendulum
+, pytestCheckHook
+, mock
}:
buildPythonApplication rec {
pname = "pgcli";
- version = "3.0.0";
+ version = "3.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829";
+ sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b";
};
propagatedBuildInputs = [
- cli-helpers click configobj humanize prompt_toolkit psycopg2
- pygments sqlparse pgspecial setproctitle keyring
+ cli-helpers
+ click
+ configobj
+ humanize
+ prompt_toolkit
+ psycopg2
+ pygments
+ sqlparse
+ pgspecial
+ setproctitle
+ keyring
+ pendulum
];
- patches = [
- (fetchpatch {
- name = "enable-sqlparse-4.patch";
- url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch";
- sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w";
- includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ];
- })
- ];
+ checkInputs = [ pytestCheckHook mock ];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit"
- '';
+ disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ];
- checkInputs = [ pytest mock ];
-
- # `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104
- checkPhase = ''
- pytest --deselect=tests/test_main.py::test_application_name_db_uri
- '';
-
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "Command-line interface for PostgreSQL";
longDescription = ''
Rich command-line interface for PostgreSQL with auto-completion and
syntax highlighting.
'';
homepage = "https://pgcli.com";
+ changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
index 51c22199cc..843059b335 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
- version = "0.2.13";
+ version = "0.2.14";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
- sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw";
+ sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind";
};
- cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz";
+ cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda";
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
index b0a99e1dc2..b1437ac46a 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2020.1204.0";
+ version = "2020.1225.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5";
+ sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0=";
};
patches = [ ./bypass-tamper-detection.patch ];
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
- export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+ export DOTNET_NOLOGO=1
nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "$nugetDeps" "$PWD/nixos"
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
mkdir -p $HOME/.nuget/NuGet
cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet
- dotnet restore --source "$PWD/nixos" osu.Desktop
+ dotnet restore --source "$PWD/nixos" osu.Desktop --runtime ${runtimeId}
runHook postConfigure
'';
@@ -59,6 +59,7 @@ in stdenv.mkDerivation rec {
dotnet build osu.Desktop \
--no-restore \
--configuration Release \
+ --runtime ${runtimeId} \
-p:Version=${version}
runHook postBuild
'';
@@ -69,10 +70,9 @@ in stdenv.mkDerivation rec {
dotnet publish osu.Desktop \
--no-build \
--configuration Release \
+ --runtime ${runtimeId} \
--no-self-contained \
--output $out/lib/osu
- shopt -s extglob
- rm -r $out/lib/osu/runtimes/!(${runtimeId})
makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \
--set DOTNET_ROOT "${dotnet-netcore}" \
@@ -93,6 +93,13 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
+ fixupPhase = ''
+ runHook preFixup
+ cp -f ${./osu.runtimeconfig.json} "$out/lib/osu/osu!.runtimeconfig.json"
+ ln -sft $out/lib/osu ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}
+ runHook postFixup
+ '';
+
# Strip breaks the executable.
dontStrip = true;
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
index 8a24f0b1bd..cebdde1f7c 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix
@@ -16,29 +16,14 @@
})
(fetchNuGet {
name = "DiscordRichPresence";
- version = "1.0.166";
- sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a";
+ version = "1.0.169";
+ sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf";
})
(fetchNuGet {
name = "FFmpeg.AutoGen";
version = "4.3.0.1";
sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv";
})
- (fetchNuGet {
- name = "Humanizer";
- version = "2.8.26";
- sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak";
- })
- (fetchNuGet {
- name = "Humanizer.Core";
- version = "2.2.0";
- sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5";
- })
- (fetchNuGet {
- name = "Humanizer.Core";
- version = "2.8.26";
- sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm";
- })
(fetchNuGet {
name = "Humanizer.Core.af";
version = "2.8.26";
@@ -99,16 +84,16 @@
version = "2.8.26";
sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd";
})
- (fetchNuGet {
- name = "Humanizer.Core.fr";
- version = "2.8.26";
- sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m";
- })
(fetchNuGet {
name = "Humanizer.Core.fr-BE";
version = "2.8.26";
sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb";
})
+ (fetchNuGet {
+ name = "Humanizer.Core.fr";
+ version = "2.8.26";
+ sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m";
+ })
(fetchNuGet {
name = "Humanizer.Core.he";
version = "2.8.26";
@@ -159,16 +144,16 @@
version = "2.8.26";
sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px";
})
- (fetchNuGet {
- name = "Humanizer.Core.nb";
- version = "2.8.26";
- sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90";
- })
(fetchNuGet {
name = "Humanizer.Core.nb-NO";
version = "2.8.26";
sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2";
})
+ (fetchNuGet {
+ name = "Humanizer.Core.nb";
+ version = "2.8.26";
+ sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90";
+ })
(fetchNuGet {
name = "Humanizer.Core.nl";
version = "2.8.26";
@@ -204,16 +189,16 @@
version = "2.8.26";
sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n";
})
- (fetchNuGet {
- name = "Humanizer.Core.sr";
- version = "2.8.26";
- sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv";
- })
(fetchNuGet {
name = "Humanizer.Core.sr-Latn";
version = "2.8.26";
sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi";
})
+ (fetchNuGet {
+ name = "Humanizer.Core.sr";
+ version = "2.8.26";
+ sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv";
+ })
(fetchNuGet {
name = "Humanizer.Core.sv";
version = "2.8.26";
@@ -259,31 +244,51 @@
version = "2.8.26";
sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh";
})
+ (fetchNuGet {
+ name = "Humanizer.Core";
+ version = "2.2.0";
+ sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5";
+ })
+ (fetchNuGet {
+ name = "Humanizer.Core";
+ version = "2.8.26";
+ sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm";
+ })
+ (fetchNuGet {
+ name = "Humanizer";
+ version = "2.8.26";
+ sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak";
+ })
(fetchNuGet {
name = "JetBrains.Annotations";
version = "2020.3.0";
sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2";
})
- (fetchNuGet {
- name = "ManagedBass";
- version = "2.0.4";
- sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003";
- })
- (fetchNuGet {
- name = "ManagedBass.Fx";
- version = "2.0.1";
- sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d";
- })
(fetchNuGet {
name = "managed-midi";
version = "1.9.14";
sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h";
})
+ (fetchNuGet {
+ name = "ManagedBass.Fx";
+ version = "2.0.1";
+ sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d";
+ })
+ (fetchNuGet {
+ name = "ManagedBass";
+ version = "2.0.4";
+ sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003";
+ })
(fetchNuGet {
name = "Markdig";
version = "0.22.0";
sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf";
})
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
+ version = "3.1.8";
+ sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";
+ })
(fetchNuGet {
name = "Microsoft.AspNetCore.Connections.Abstractions";
version = "3.1.9";
@@ -304,16 +309,16 @@
version = "3.1.9";
sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx";
})
- (fetchNuGet {
- name = "Microsoft.AspNetCore.SignalR.Client";
- version = "3.1.9";
- sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx";
- })
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Client.Core";
version = "3.1.9";
sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y";
})
+ (fetchNuGet {
+ name = "Microsoft.AspNetCore.SignalR.Client";
+ version = "3.1.9";
+ sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx";
+ })
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Common";
version = "3.1.9";
@@ -364,16 +369,16 @@
version = "3.8.0";
sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw";
})
- (fetchNuGet {
- name = "Microsoft.CodeAnalysis.CSharp";
- version = "3.8.0";
- sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb";
- })
(fetchNuGet {
name = "Microsoft.CodeAnalysis.CSharp.Workspaces";
version = "3.8.0";
sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb";
})
+ (fetchNuGet {
+ name = "Microsoft.CodeAnalysis.CSharp";
+ version = "3.8.0";
+ sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb";
+ })
(fetchNuGet {
name = "Microsoft.CodeAnalysis.FxCopAnalyzers";
version = "3.3.1";
@@ -429,11 +434,6 @@
version = "2.1.0";
sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy";
})
- (fetchNuGet {
- name = "Microsoft.EntityFrameworkCore";
- version = "2.2.6";
- sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5";
- })
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Abstractions";
version = "2.2.6";
@@ -454,15 +454,20 @@
version = "2.2.6";
sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z";
})
+ (fetchNuGet {
+ name = "Microsoft.EntityFrameworkCore.Sqlite.Core";
+ version = "2.2.6";
+ sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630";
+ })
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Sqlite";
version = "2.2.6";
sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam";
})
(fetchNuGet {
- name = "Microsoft.EntityFrameworkCore.Sqlite.Core";
+ name = "Microsoft.EntityFrameworkCore";
version = "2.2.6";
- sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630";
+ sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5";
})
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Abstractions";
@@ -474,16 +479,6 @@
version = "2.2.0";
sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv";
})
- (fetchNuGet {
- name = "Microsoft.Extensions.Configuration";
- version = "2.2.0";
- sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Configuration";
- version = "3.1.9";
- sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9";
- })
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "2.2.0";
@@ -505,14 +500,14 @@
sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78";
})
(fetchNuGet {
- name = "Microsoft.Extensions.DependencyInjection";
+ name = "Microsoft.Extensions.Configuration";
version = "2.2.0";
- sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
+ sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
})
(fetchNuGet {
- name = "Microsoft.Extensions.DependencyInjection";
+ name = "Microsoft.Extensions.Configuration";
version = "3.1.9";
- sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb";
+ sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
@@ -524,21 +519,21 @@
version = "3.1.9";
sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.DependencyInjection";
+ version = "2.2.0";
+ sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.DependencyInjection";
+ version = "3.1.9";
+ sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.DependencyModel";
version = "2.1.0";
sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd";
})
- (fetchNuGet {
- name = "Microsoft.Extensions.Logging";
- version = "2.2.0";
- sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.Logging";
- version = "3.1.9";
- sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl";
- })
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "2.2.0";
@@ -549,6 +544,16 @@
version = "3.1.9";
sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp";
})
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Logging";
+ version = "2.2.0";
+ sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.Logging";
+ version = "3.1.9";
+ sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
version = "5.0.0";
@@ -579,6 +584,11 @@
version = "3.3.1";
sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn";
})
+ (fetchNuGet {
+ name = "Microsoft.NETCore.App.Runtime.linux-x64";
+ version = "3.1.8";
+ sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";
+ })
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
version = "1.0.1";
@@ -674,16 +684,16 @@
version = "3.12.0";
sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
})
- (fetchNuGet {
- name = "ppy.osu.Framework";
- version = "2020.1203.0";
- sha256 = "0xk1l09gm39z1739a7bgykj2bkg6lgxx72ds9s7qmbc6nrkr7jwj";
- })
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
version = "2020.923.0";
sha256 = "1sy98s0dxcfxxslm1q503qhd9fl8d3idf47qi4561j5fds4dpdsv";
})
+ (fetchNuGet {
+ name = "ppy.osu.Framework";
+ version = "2020.1222.0";
+ sha256 = "0xdfgl4hykrbwhdmhhy7rxp055jhq1rwg2mldbbaf1v43s0vkyfj";
+ })
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2020.1202.0";
@@ -709,6 +719,176 @@
version = "2.2.0";
sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf";
})
+ (fetchNuGet {
+ name = "runtime.any.System.Collections";
+ version = "4.0.11";
+ sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Collections";
+ version = "4.3.0";
+ sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Diagnostics.Tools";
+ version = "4.0.1";
+ sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Diagnostics.Tools";
+ version = "4.3.0";
+ sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Diagnostics.Tracing";
+ version = "4.1.0";
+ sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Diagnostics.Tracing";
+ version = "4.3.0";
+ sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization.Calendars";
+ version = "4.0.1";
+ sha256 = "007iw5wnl046wznasbqxjxm949djdbsi9vwz6zhz4lmzviqcpl58";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization.Calendars";
+ version = "4.3.0";
+ sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization";
+ version = "4.0.11";
+ sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization";
+ version = "4.3.0";
+ sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.IO";
+ version = "4.1.0";
+ sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.IO";
+ version = "4.3.0";
+ sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection.Extensions";
+ version = "4.0.1";
+ sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection.Extensions";
+ version = "4.3.0";
+ sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection.Primitives";
+ version = "4.0.1";
+ sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection.Primitives";
+ version = "4.3.0";
+ sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection";
+ version = "4.1.0";
+ sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Reflection";
+ version = "4.3.0";
+ sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Resources.ResourceManager";
+ version = "4.0.1";
+ sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Resources.ResourceManager";
+ version = "4.3.0";
+ sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.Handles";
+ version = "4.0.1";
+ sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.Handles";
+ version = "4.3.0";
+ sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.InteropServices";
+ version = "4.3.0";
+ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime";
+ version = "4.1.0";
+ sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime";
+ version = "4.3.0";
+ sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Text.Encoding.Extensions";
+ version = "4.0.11";
+ sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Text.Encoding.Extensions";
+ version = "4.3.0";
+ sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Text.Encoding";
+ version = "4.0.11";
+ sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Text.Encoding";
+ version = "4.3.0";
+ sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Threading.Tasks";
+ version = "4.3.0";
+ sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Threading.Timer";
+ version = "4.0.1";
+ sha256 = "14p9qc9y8ay6kgz363xlxy5c75ilq3r7zw4ddx7348iir0m140ir";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Threading.Timer";
+ version = "4.3.0";
+ sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086";
+ })
(fetchNuGet {
name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@@ -724,16 +904,6 @@
version = "4.3.0";
sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
})
- (fetchNuGet {
- name = "runtime.native.System";
- version = "4.0.0";
- sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
- })
- (fetchNuGet {
- name = "runtime.native.System";
- version = "4.3.0";
- sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
- })
(fetchNuGet {
name = "runtime.native.System.IO.Compression";
version = "4.1.0";
@@ -754,11 +924,6 @@
version = "4.3.0";
sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk";
})
- (fetchNuGet {
- name = "runtime.native.System.Security.Cryptography";
- version = "4.0.0";
- sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
- })
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
@@ -769,6 +934,21 @@
version = "4.3.0";
sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97";
})
+ (fetchNuGet {
+ name = "runtime.native.System.Security.Cryptography";
+ version = "4.0.0";
+ sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System";
+ version = "4.0.0";
+ sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System";
+ version = "4.3.0";
+ sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
+ })
(fetchNuGet {
name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@@ -810,9 +990,84 @@
sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
})
(fetchNuGet {
- name = "Sentry";
- version = "2.1.8";
- sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn";
+ name = "runtime.unix.Microsoft.Win32.Primitives";
+ version = "4.0.1";
+ sha256 = "1i47c440zlibzhyh2dr45jgbsmn3a7ki1paappdf9af4qrlaas63";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.Microsoft.Win32.Primitives";
+ version = "4.3.0";
+ sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Console";
+ version = "4.0.0";
+ sha256 = "0q96nlj42yj0b020j22z6j3qiza7lz7sb1r34dy4r1f3cq9s5zp6";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Console";
+ version = "4.3.0";
+ sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Diagnostics.Debug";
+ version = "4.0.11";
+ sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Diagnostics.Debug";
+ version = "4.3.0";
+ sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.IO.FileSystem";
+ version = "4.0.1";
+ sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.IO.FileSystem";
+ version = "4.3.0";
+ sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Net.Primitives";
+ version = "4.0.11";
+ sha256 = "1fy9hy30bs3pv6jr2ci2vscgycz64r1bgl91s51psidzh64i1gp9";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Net.Primitives";
+ version = "4.3.0";
+ sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Net.Sockets";
+ version = "4.1.0";
+ sha256 = "0vj5n45mm2k2khayvrp1lbz5djnp5lac1dna37g5c0nh7pmzgc4f";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Net.Sockets";
+ version = "4.3.0";
+ sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Private.Uri";
+ version = "4.0.1";
+ sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Private.Uri";
+ version = "4.3.0";
+ sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Runtime.Extensions";
+ version = "4.1.0";
+ sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Runtime.Extensions";
+ version = "4.3.0";
+ sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p";
})
(fetchNuGet {
name = "Sentry.PlatformAbstractions";
@@ -824,6 +1079,11 @@
version = "2.1.8";
sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l";
})
+ (fetchNuGet {
+ name = "Sentry";
+ version = "2.1.8";
+ sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn";
+ })
(fetchNuGet {
name = "SharpCompress";
version = "0.17.1";
@@ -914,16 +1174,6 @@
version = "4.5.1";
sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3";
})
- (fetchNuGet {
- name = "System.Collections";
- version = "4.0.11";
- sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
- })
- (fetchNuGet {
- name = "System.Collections";
- version = "4.3.0";
- sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
- })
(fetchNuGet {
name = "System.Collections.Concurrent";
version = "4.0.12";
@@ -949,6 +1199,16 @@
version = "5.0.0";
sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";
})
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.0.11";
+ sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
+ })
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.3.0";
+ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
+ })
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "4.5.0";
@@ -959,11 +1219,6 @@
version = "5.0.0";
sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j";
})
- (fetchNuGet {
- name = "System.Composition";
- version = "1.0.31";
- sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61";
- })
(fetchNuGet {
name = "System.Composition.AttributedModel";
version = "1.0.31";
@@ -989,6 +1244,11 @@
version = "1.0.31";
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
})
+ (fetchNuGet {
+ name = "System.Composition";
+ version = "1.0.31";
+ sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61";
+ })
(fetchNuGet {
name = "System.Console";
version = "4.0.0";
@@ -1049,16 +1309,6 @@
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
- (fetchNuGet {
- name = "System.Globalization";
- version = "4.0.11";
- sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
- })
- (fetchNuGet {
- name = "System.Globalization";
- version = "4.3.0";
- sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
- })
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.0.1";
@@ -1079,31 +1329,21 @@
version = "4.3.0";
sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
})
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.0.11";
+ sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
+ })
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.3.0";
+ sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
+ })
(fetchNuGet {
name = "System.Interactive.Async";
version = "3.2.0";
sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d";
})
- (fetchNuGet {
- name = "System.IO";
- version = "4.1.0";
- sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
- })
- (fetchNuGet {
- name = "System.IO";
- version = "4.3.0";
- sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
- })
- (fetchNuGet {
- name = "System.IO.Compression";
- version = "4.1.0";
- sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
- })
- (fetchNuGet {
- name = "System.IO.Compression";
- version = "4.3.0";
- sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
- })
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
version = "4.0.1";
@@ -1115,14 +1355,14 @@
sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar";
})
(fetchNuGet {
- name = "System.IO.FileSystem";
- version = "4.0.1";
- sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+ name = "System.IO.Compression";
+ version = "4.1.0";
+ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
})
(fetchNuGet {
- name = "System.IO.FileSystem";
+ name = "System.IO.Compression";
version = "4.3.0";
- sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
+ sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
})
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
@@ -1134,6 +1374,16 @@
version = "4.3.0";
sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
})
+ (fetchNuGet {
+ name = "System.IO.FileSystem";
+ version = "4.0.1";
+ sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem";
+ version = "4.3.0";
+ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
+ })
(fetchNuGet {
name = "System.IO.Packaging";
version = "5.0.0";
@@ -1145,14 +1395,14 @@
sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy";
})
(fetchNuGet {
- name = "System.Linq";
+ name = "System.IO";
version = "4.1.0";
- sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
})
(fetchNuGet {
- name = "System.Linq";
+ name = "System.IO";
version = "4.3.0";
- sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+ sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
(fetchNuGet {
name = "System.Linq.Expressions";
@@ -1169,6 +1419,16 @@
version = "4.0.1";
sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw";
})
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.1.0";
+ sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ })
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.3.0";
+ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+ })
(fetchNuGet {
name = "System.Memory";
version = "4.5.1";
@@ -1199,6 +1459,16 @@
version = "4.3.0";
sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j";
})
+ (fetchNuGet {
+ name = "System.Net.NameResolution";
+ version = "4.0.0";
+ sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh";
+ })
+ (fetchNuGet {
+ name = "System.Net.NameResolution";
+ version = "4.3.0";
+ sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq";
+ })
(fetchNuGet {
name = "System.Net.Primitives";
version = "4.0.11";
@@ -1240,24 +1510,14 @@
sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
})
(fetchNuGet {
- name = "System.Reflection";
- version = "4.1.0";
- sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
- })
- (fetchNuGet {
- name = "System.Reflection";
- version = "4.3.0";
- sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
- })
- (fetchNuGet {
- name = "System.Reflection.Emit";
+ name = "System.Private.Uri";
version = "4.0.1";
- sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+ sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j";
})
(fetchNuGet {
- name = "System.Reflection.Emit";
+ name = "System.Private.Uri";
version = "4.3.0";
- sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
+ sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";
})
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
@@ -1284,6 +1544,16 @@
version = "4.7.0";
sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap";
})
+ (fetchNuGet {
+ name = "System.Reflection.Emit";
+ version = "4.0.1";
+ sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit";
+ version = "4.3.0";
+ sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
+ })
(fetchNuGet {
name = "System.Reflection.Extensions";
version = "4.0.1";
@@ -1324,6 +1594,16 @@
version = "4.3.0";
sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
})
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.1.0";
+ sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+ })
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.3.0";
+ sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+ })
(fetchNuGet {
name = "System.Resources.ResourceManager";
version = "4.0.1";
@@ -1334,16 +1614,6 @@
version = "4.3.0";
sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
})
- (fetchNuGet {
- name = "System.Runtime";
- version = "4.1.0";
- sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
- })
- (fetchNuGet {
- name = "System.Runtime";
- version = "4.3.0";
- sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
- })
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.5.1";
@@ -1384,16 +1654,6 @@
version = "4.3.0";
sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
})
- (fetchNuGet {
- name = "System.Runtime.InteropServices";
- version = "4.1.0";
- sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
- })
- (fetchNuGet {
- name = "System.Runtime.InteropServices";
- version = "4.3.0";
- sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
- })
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.0.0";
@@ -1404,6 +1664,16 @@
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices";
+ version = "4.3.0";
+ sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
+ })
(fetchNuGet {
name = "System.Runtime.Numerics";
version = "4.0.1";
@@ -1419,11 +1689,31 @@
version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.1.0";
+ sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+ })
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.3.0";
+ sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+ })
(fetchNuGet {
name = "System.Security.AccessControl";
version = "5.0.0";
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
})
+ (fetchNuGet {
+ name = "System.Security.Claims";
+ version = "4.0.1";
+ sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6";
+ })
+ (fetchNuGet {
+ name = "System.Security.Claims";
+ version = "4.3.0";
+ sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn";
+ })
(fetchNuGet {
name = "System.Security.Cryptography.Algorithms";
version = "4.2.0";
@@ -1494,20 +1784,30 @@
version = "4.3.0";
sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h";
})
+ (fetchNuGet {
+ name = "System.Security.Principal.Windows";
+ version = "4.0.0";
+ sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z";
+ })
+ (fetchNuGet {
+ name = "System.Security.Principal.Windows";
+ version = "4.3.0";
+ sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr";
+ })
(fetchNuGet {
name = "System.Security.Principal.Windows";
version = "5.0.0";
sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8";
})
(fetchNuGet {
- name = "System.Text.Encoding";
- version = "4.0.11";
- sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+ name = "System.Security.Principal";
+ version = "4.0.1";
+ sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p";
})
(fetchNuGet {
- name = "System.Text.Encoding";
+ name = "System.Security.Principal";
version = "4.3.0";
- sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+ sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf";
})
(fetchNuGet {
name = "System.Text.Encoding.CodePages";
@@ -1529,6 +1829,16 @@
version = "4.3.0";
sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
})
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.0.11";
+ sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.3.0";
+ sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+ })
(fetchNuGet {
name = "System.Text.Encodings.Web";
version = "4.7.1";
@@ -1549,31 +1859,11 @@
version = "4.3.0";
sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
})
- (fetchNuGet {
- name = "System.Threading";
- version = "4.0.11";
- sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
- })
- (fetchNuGet {
- name = "System.Threading";
- version = "4.3.0";
- sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
- })
(fetchNuGet {
name = "System.Threading.Channels";
version = "4.7.1";
sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2";
})
- (fetchNuGet {
- name = "System.Threading.Tasks";
- version = "4.0.11";
- sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
- })
- (fetchNuGet {
- name = "System.Threading.Tasks";
- version = "4.3.0";
- sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
- })
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.0.0";
@@ -1589,11 +1879,31 @@
version = "4.5.4";
sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153";
})
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.3.0";
+ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+ })
(fetchNuGet {
name = "System.Threading.Thread";
version = "4.0.0";
sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
})
+ (fetchNuGet {
+ name = "System.Threading.ThreadPool";
+ version = "4.0.10";
+ sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx";
+ })
+ (fetchNuGet {
+ name = "System.Threading.ThreadPool";
+ version = "4.3.0";
+ sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1";
+ })
(fetchNuGet {
name = "System.Threading.Timer";
version = "4.0.1";
@@ -1604,6 +1914,16 @@
version = "4.3.0";
sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56";
})
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.0.11";
+ sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
+ })
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.3.0";
+ sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+ })
(fetchNuGet {
name = "System.Xml.ReaderWriter";
version = "4.0.11";
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json b/third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json
new file mode 100644
index 0000000000..ec942fede6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/osu.runtimeconfig.json
@@ -0,0 +1,9 @@
+{
+ "runtimeOptions": {
+ "tfm": "netcoreapp3.1",
+ "framework": {
+ "name": "Microsoft.NETCore.App",
+ "version": "3.1.0"
+ }
+ }
+}
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh
index be8fa3fe71..3c78ae8a50 100755
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/update.sh
@@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
deps_file="$(realpath "./deps.nix")"
-new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases" | jq -r '.[0].name')"
+new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Up to date"
@@ -36,7 +36,7 @@ cat >./nuget_tmp.config <
EOF
-dotnet restore osu.Desktop --configfile ./nuget_tmp.config
+dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64
echo "{ fetchNuGet }: [" >"$deps_file"
while read pkg_spec; do
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix
index 90352a944d..9e775de62f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuset/default.nix
@@ -1,27 +1,44 @@
{ stdenv
, fetchFromGitHub
-, python2Packages
+, fetchpatch
+, pythonPackages
}:
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
pname = "cpuset";
- version = "1.5.8";
+ version = "1.6";
- propagatedBuildInputs = [ ];
+ propagatedBuildInputs = with pythonPackages; [
+ configparser
+ future
+ ];
+
+ # https://github.com/lpechacek/cpuset/pull/36
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/MawKKe/cpuset/commit/a4b6b275d0a43d2794ab9e82922d3431aeea9903.patch";
+ sha256 = "1mi1xrql81iczl67s4dk2rm9r1mk36qhsa19wn7zgryf95krsix2";
+ })
+ ];
makeFlags = [ "prefix=$(out)" ];
src = fetchFromGitHub {
- owner = "wykurz";
+ owner = "lpechacek";
repo = "cpuset";
rev = "v${version}";
- sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm";
+ sha256 = "0ig0ml2zd5542d0989872vmy7cs3qg7nxwa93k42bdkm50amhar4";
};
+ checkPhase = ''
+ cd t
+ make
+ '';
+
meta = with stdenv.lib; {
description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier";
- homepage = "https://github.com/wykurz/cpuset";
+ homepage = "https://github.com/lpechacek/cpuset";
license = licenses.gpl2;
- maintainers = with maintainers; [ wykurz ];
+ maintainers = with maintainers; [ thiagokokada wykurz ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
new file mode 100644
index 0000000000..c2d844edec
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
@@ -0,0 +1,84 @@
+From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
+From: Florian Klink
+Date: Sun, 27 Dec 2020 13:03:12 +0100
+Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
+
+This allows running the unit tests in environments where `dbus-daemon`
+isn't in /usr/bin, but in $PATH.
+
+Signed-off-by: Florian Klink
+---
+ unit/test-dbus-message-fds.c | 4 ++--
+ unit/test-dbus-properties.c | 4 ++--
+ unit/test-dbus.c | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
+index 6f68bae..4b5662e 100644
+--- a/unit/test-dbus-message-fds.c
++++ b/unit/test-dbus-message-fds.c
+@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
+ char *prg_envp[1];
+ pid_t pid;
+
+- prg_argv[0] = "/usr/bin/dbus-daemon";
++ prg_argv[0] = "dbus-daemon";
+ prg_argv[1] = "--nopidfile";
+ prg_argv[2] = "--nofork";
+ prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
+ }
+
+ if (pid == 0) {
+- execve(prg_argv[0], prg_argv, prg_envp);
++ execvpe(prg_argv[0], prg_argv, prg_envp);
+ exit(EXIT_SUCCESS);
+ }
+
+diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
+index b435062..049f0f4 100644
+--- a/unit/test-dbus-properties.c
++++ b/unit/test-dbus-properties.c
+@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
+ char *prg_envp[1];
+ pid_t pid;
+
+- prg_argv[0] = "/usr/bin/dbus-daemon";
++ prg_argv[0] = "dbus-daemon";
+ prg_argv[1] = "--nopidfile";
+ prg_argv[2] = "--nofork";
+ prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
+ }
+
+ if (pid == 0) {
+- execve(prg_argv[0], prg_argv, prg_envp);
++ execvpe(prg_argv[0], prg_argv, prg_envp);
+ exit(EXIT_SUCCESS);
+ }
+
+diff --git a/unit/test-dbus.c b/unit/test-dbus.c
+index 67f0a7b..582847e 100644
+--- a/unit/test-dbus.c
++++ b/unit/test-dbus.c
+@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
+ char *prg_envp[1];
+ pid_t pid;
+
+- prg_argv[0] = "/usr/bin/dbus-daemon";
++ prg_argv[0] = "dbus-daemon";
+ prg_argv[1] = "--nopidfile";
+ prg_argv[2] = "--nofork";
+ prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
+ }
+
+ if (pid == 0) {
+- execve(prg_argv[0], prg_argv, prg_envp);
++ execvpe(prg_argv[0], prg_argv, prg_envp);
+ exit(EXIT_SUCCESS);
+ }
+
+--
+2.29.2
+
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
index 21f98889ca..c6aed21cd8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
@@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchgit {
- url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
- rev = version;
- sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk";
+ url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
+ rev = version;
+ sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk";
};
patches = [
- ./fix-dbus-tests.patch
+ # Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
+ ./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
];
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch
deleted file mode 100644
index b494ba8b43..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/fix-dbus-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -140,6 +140,7 @@
- ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES)
-
- AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \
-+ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \
- -DCERTDIR=\""$(top_builddir)/unit/"\"
-
- pkgconfigdir = $(libdir)/pkgconfig
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,6 +14,8 @@
-
- AC_PREFIX_DEFAULT(/usr/local)
-
-+PKG_PROG_PKG_CONFIG
-+
- COMPILER_FLAGS
-
- AC_LANG_C
-@@ -131,6 +133,10 @@
- AC_CHECK_PROG(have_xxd, [xxd], [yes], [no])
- fi
-
-+PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes,
-+ AC_MSG_ERROR(D-Bus is required for running tests))
-+PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir)
-+
- AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes")
- AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes")
-
---- a/unit/test-dbus-message-fds.c
-+++ b/unit/test-dbus-message-fds.c
-@@ -51,7 +51,7 @@
- char *prg_envp[1];
- pid_t pid;
-
-- prg_argv[0] = "/usr/bin/dbus-daemon";
-+ prg_argv[0] = DBUS_DAEMON;
- prg_argv[1] = "--nopidfile";
- prg_argv[2] = "--nofork";
- prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
---- a/unit/test-dbus-properties.c
-+++ b/unit/test-dbus-properties.c
-@@ -48,7 +48,7 @@
- char *prg_envp[1];
- pid_t pid;
-
-- prg_argv[0] = "/usr/bin/dbus-daemon";
-+ prg_argv[0] = DBUS_DAEMON;
- prg_argv[1] = "--nopidfile";
- prg_argv[2] = "--nofork";
- prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
---- a/unit/test-dbus.c
-+++ b/unit/test-dbus.c
-@@ -45,7 +45,7 @@
- char *prg_envp[1];
- pid_t pid;
-
-- prg_argv[0] = "/usr/bin/dbus-daemon";
-+ prg_argv[0] = DBUS_DAEMON;
- prg_argv[1] = "--nopidfile";
- prg_argv[2] = "--nofork";
- prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 6c4d49e4e2..79d6edcf94 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }:
stdenv.mkDerivation {
pname = "raspberrypi-tools";
@@ -13,6 +13,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig ];
+ patches = [
+ (fetchpatch {
+ # https://github.com/raspberrypi/userland/pull/670
+ url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";
+ sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";
+ })
+ ];
+
preConfigure = ''
cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out")
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
@@ -23,7 +31,7 @@ stdenv.mkDerivation {
description = "Userland tools for the Raspberry Pi board";
homepage = "https://github.com/raspberrypi/userland";
license = licenses.bsd3;
- platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
+ platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
maintainers = with maintainers; [ dezgeg tavyc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
index 64ac3342ac..0cbd7ff3a3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2";
};
- outputs = [ "out" "man" "test" ];
+ outputs = [ "out" "man" ]
+ ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test";
nativeBuildInputs = [
autoreconfHook
@@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
checkInputs = [ openssl ];
- pythonPath = [
+ # wrapPython wraps the scripts in $test. They pull in gobject-introspection,
+ # which doesn't cross-compile.
+ pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
python3Packages.dbus-python
python3Packages.pygobject3
];
@@ -61,11 +64,12 @@ stdenv.mkDerivation rec {
doCheck = true;
postInstall = ''
- mkdir -p $test/bin
- cp -a test/* $test/bin/
mkdir -p $out/share
cp -a doc $out/share/
cp -a README AUTHORS TODO $out/share/doc/
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+ mkdir -p $test/bin
+ cp -a test/* $test/bin/
'';
preFixup = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix
new file mode 100644
index 0000000000..76150affe4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/zsa-udev-rules/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ pname = "zsa-udev-rules";
+ version = "unstable-2020-12-16";
+
+ # TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release
+ src = fetchFromGitHub {
+ owner = "zsa";
+ repo = "wally";
+ rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6";
+ sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417";
+ };
+
+ # it only installs files
+ dontConfigure = true;
+ dontBuild = true;
+ dontFixup = true;
+
+ installPhase = ''
+ mkdir -p $out/lib/udev/rules.d
+ cp dist/linux64/50-oryx.rules $out/lib/udev/rules.d/
+ cp dist/linux64/50-wally.rules $out/lib/udev/rules.d/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "udev rules for ZSA devices";
+ license = licenses.mit;
+ maintainers = with maintainers; [ davidak ];
+ platforms = platforms.linux;
+ homepage = "https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
index ac261a9a11..9e2c482e0d 100644
--- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
- version = "20.11.0.1";
+ version = "20.11.2.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
- sha256 = "0f750wlvm48j5b2fkvhy47zyagxfl6kbn2m9lx0spxwyn9qgh6bn";
+ sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 4b63b589ea..71f8c8054c 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
- inherit apr aprutil sslSupport proxySupport ldapSupport;
+ inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5;
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix
index adbcbb6375..7ec56b023e 100644
--- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
- sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6";
+ sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k";
};
patches = [ ./sysstatedir.patch ];
diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/sysstatedir.patch b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/sysstatedir.patch
index 534f71743e..fff3d58973 100644
--- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/sysstatedir.patch
+++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/sysstatedir.patch
@@ -1,15 +1,22 @@
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
-index 51697310b..2b5f91075 100644
+index 2a5795e9f..7314e0594 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
-@@ -72,8 +72,8 @@
+@@ -71,13 +71,13 @@
+ #cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
#define NFS_GANESHA 1
- #define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
+-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
++#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
/**
* @brief Default value for krb5_param.ccache_dir
*/
+-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
++#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
+
+ /* We're LGPL'd */
+ #define _LGPL_SOURCE 1
diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
index 6bd3ebc423..515282c1db 100644
--- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, python3Packages
+, installShellFiles
}:
python3Packages.buildPythonApplication rec {
@@ -24,10 +25,17 @@ python3Packages.buildPythonApplication rec {
prometheus_client
];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installManPage xandikos.1
+ '';
+
meta = with stdenv.lib; {
description = "Lightweight CalDAV/CardDAV server";
homepage = "https://github.com/jelmer/xandikos";
license = licenses.gpl3Plus;
+ changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS";
maintainers = with maintainers; [ _0x4A6F ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
index 565196280c..cbe6e3eed1 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
- version = "2.1.4";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd";
+ sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam";
};
- vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a";
+ vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r";
doCheck = false;
@@ -25,6 +25,7 @@ buildGoModule rec {
meta = with lib; {
description = "Vulnerability Static Analysis for Containers";
homepage = "https://github.com/quay/clair";
+ changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ marsam ];
};
diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix
new file mode 100644
index 0000000000..f3cc514161
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "credhub-cli";
+ version = "2.9.0";
+
+ src = fetchFromGitHub {
+ owner = "cloudfoundry-incubator";
+ repo = "credhub-cli";
+ rev = version;
+ sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
+ };
+
+ # these tests require network access that we're not going to give them
+ postPatch = ''
+ rm commands/api_test.go
+ rm commands/socks5_test.go
+ '';
+ __darwinAllowLocalNetworking = true;
+
+ vendorSha256 = null;
+
+ buildFlagsArray = [
+ "-ldflags="
+ "-s"
+ "-w"
+ "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}"
+ ];
+
+ postInstall = ''
+ ln -s $out/bin/credhub-cli $out/bin/credhub
+ '';
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Provides a command line interface to interact with CredHub servers";
+ homepage = "https://github.com/cloudfoundry-incubator/credhub-cli";
+ maintainers = with maintainers; [ ris ];
+ license = licenses.asl20;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
index 7bfb9e5739..f7d9896431 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
- version = "1.1.14";
+ version = "1.1.15";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx";
+ sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix
index 19a0e26d9c..1d3696a8cd 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/jhead/default.nix
@@ -43,5 +43,10 @@ stdenv.mkDerivation rec {
license = licenses.publicDomain;
maintainers = with maintainers; [ rycee ];
platforms = platforms.all;
+ # https://github.com/NixOS/nixpkgs/issues/90828
+ knownVulnerabilities = [
+ "CVE-2020-6624"
+ "CVE-2020-6625"
+ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix
index f81d9b7266..2155b8676b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/kermit/default.nix
@@ -16,12 +16,12 @@ stdenv.mkDerivation {
tar xvzf $src
'';
- patchPhase = ''
+ postPatch = ''
sed -i -e 's@-I/usr/include/ncurses@@' \
-e 's@/usr/local@'"$out"@ makefile
'';
- buildPhase = "make -f makefile linux LNKFLAGS='-lcrypt -lresolv'";
+ buildPhase = "make -f makefile linux KFLAGS='-D_IO_file_flags' LNKFLAGS='-lcrypt -lresolv'";
installPhase = ''
mkdir -p $out/bin
@@ -35,6 +35,5 @@ stdenv.mkDerivation {
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix
index 053d2ae59d..6a13c455fe 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
buildPythonApplication rec {
pname = "you-get";
- version = "0.4.1488";
+ version = "0.4.1500";
# 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 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3";
+ sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92";
};
meta = with stdenv.lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index 9950a46be1..2b252dabb5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
+++ b/third_party/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.12.22";
+ version = "2020.12.26";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "0v7pyrdii8yqcx9pjl6r46qj7ljjmwmwkrd5sghf1vmgfwacx5fc";
+ sha256 = "1kqfrci4qg6bx7ywzppidjqxsx1c4l5psmwqcylw66bs0s442fwy";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index dc68923686..2b5a464354 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z-lua";
- version = "1.8.7";
+ version = "1.8.10";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "z.lua";
rev = version;
- sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba";
+ sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
index c9e75f39e9..ef98f48214 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,5 @@
{ stdenv
+, pkgs
, fetchurl
, fetchpatch
, zlib
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]
++ optional (hpnSupport || withGssapiPatches) autoreconfHook
- ++ optional withKerberos kerberos.dev;
+ ++ optional withKerberos pkgs.kerberos.dev;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
new file mode 100644
index 0000000000..4a75b3ca2f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
@@ -0,0 +1,31 @@
+{ buildGoModule
+, fetchFromGitHub
+, stdenv
+}:
+
+buildGoModule rec {
+ pname = "proxify";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "projectdiscovery";
+ repo = "proxify";
+ rev = "v${version}";
+ sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn";
+ };
+
+ vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig";
+
+ meta = with stdenv.lib; {
+ description = "Proxy tool for HTTP/HTTPS traffic capture";
+ longDescription = ''
+ This tool supports multiple operations such as request/response dump, filtering
+ and manipulation via DSL language, upstream HTTP/Socks5 proxy. Additionally a
+ replay utility allows to import the dumped traffic (request/responses with correct
+ domain name) into other tools by simply setting the upstream proxy to proxify.
+ '';
+ homepage = "https://github.com/projectdiscovery/proxify";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix
new file mode 100644
index 0000000000..a2295d87fe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix
@@ -0,0 +1,38 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, libpcap
+}:
+
+buildGoModule rec {
+ pname = "naabu";
+ version = "2.0.3";
+
+ src = fetchFromGitHub {
+ owner = "projectdiscovery";
+ repo = "naabu";
+ rev = "v${version}";
+ sha256 = "05iybf7q3y0piyw202yzld89fiz2dv2pmnpm1pd905phk5a23n1x";
+ };
+
+ vendorSha256 = "111qvkqdcdgir3dz267xckzlnfx72flnyi7ki7fa6ml7mkfyf70y";
+
+ buildInputs = [ libpcap ];
+
+ preBuild = ''
+ mv v2/* .
+ '';
+
+ meta = with lib; {
+ description = "Fast SYN/CONNECT port scanner";
+ longDescription = ''
+ Naabu is a port scanning tool written in Go that allows you to enumerate
+ valid ports for hosts in a fast and reliable manner. It is a really simple
+ tool that does fast SYN/CONNECT scans on the host/list of hosts and lists
+ all ports that return a reply.
+ '';
+ homepage = "https://github.com/projectdiscovery/naabu";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
index e5574be8ab..f3c9990a3c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
@@ -1,19 +1,35 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, buildGoModule
+, pcsclite
+, PCSC
+, pkg-config
+}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "step-ca";
- version = "0.13.3";
-
- goPackagePath = "github.com/smallstep/certificates";
+ version = "0.15.6";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
- sha256 = "1i42j7v5a5qqqb9ng8irblfyzykhyws0394q3zac290ymjijxbnq";
+ sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz";
};
- goDeps = ./deps.nix;
+ vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs =
+ lib.optional stdenv.isLinux (lib.getDev pcsclite)
+ ++ lib.optional stdenv.isDarwin PCSC;
+
+ # Tests fail on darwin with
+ # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
+ # probably some sandboxing issue
+ doCheck = stdenv.isLinux;
meta = with lib; {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/deps.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/deps.nix
deleted file mode 100644
index 07607b6f65..0000000000
--- a/third_party/nixpkgs/pkgs/tools/security/step-ca/deps.nix
+++ /dev/null
@@ -1,291 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/AndreasBriese/bbloom";
- fetch = {
- type = "git";
- url = "https://github.com/AndreasBriese/bbloom";
- rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815";
- sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
- };
- }
- {
- goPackagePath = "github.com/chzyer/readline";
- fetch = {
- type = "git";
- url = "https://github.com/chzyer/readline";
- rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
- sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
- };
- }
- {
- goPackagePath = "github.com/dgraph-io/badger";
- fetch = {
- type = "git";
- url = "https://github.com/dgraph-io/badger";
- rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9";
- sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-farm";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-farm";
- rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3";
- sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
- };
- }
- {
- goPackagePath = "github.com/go-chi/chi";
- fetch = {
- type = "git";
- url = "https://github.com/go-chi/chi";
- rev = "0ebf7795c516423a110473652e9ba3a59a504863";
- sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1";
- };
- }
- {
- goPackagePath = "github.com/go-sql-driver/mysql";
- fetch = {
- type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "72cd26f257d44c1114970e19afddcd812016007e";
- sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5";
- sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
- };
- }
- {
- goPackagePath = "github.com/juju/ansiterm";
- fetch = {
- type = "git";
- url = "https://github.com/juju/ansiterm";
- rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1";
- sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h";
- };
- }
- {
- goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
- fetch = {
- type = "git";
- url = "https://github.com/konsorten/go-windows-terminal-sequences";
- rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242";
- sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
- };
- }
- {
- goPackagePath = "github.com/lunixbochs/vtclean";
- fetch = {
- type = "git";
- url = "https://github.com/lunixbochs/vtclean";
- rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
- sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
- };
- }
- {
- goPackagePath = "github.com/manifoldco/promptui";
- fetch = {
- type = "git";
- url = "https://github.com/manifoldco/promptui";
- rev = "157c96fb638a14d268b305cf2012582431fcc410";
- sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
- {
- goPackagePath = "github.com/mmcloughlin/avo";
- fetch = {
- type = "git";
- url = "https://github.com/mmcloughlin/avo";
- rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7";
- sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d";
- };
- }
- {
- goPackagePath = "github.com/newrelic/go-agent";
- fetch = {
- type = "git";
- url = "https://github.com/newrelic/go-agent";
- rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba";
- sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "github.com/rs/xid";
- fetch = {
- type = "git";
- url = "https://github.com/rs/xid";
- rev = "15d26544def341f036c5f8dca987a4cbe575032c";
- sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";
- };
- }
- {
- goPackagePath = "github.com/samfoo/ansi";
- fetch = {
- type = "git";
- url = "https://github.com/samfoo/ansi";
- rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73";
- sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz";
- };
- }
- {
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
- fetch = {
- type = "git";
- url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
- sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "ad15b42461921f1fb3529b058c6786c6a45d5162";
- sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606";
- };
- }
- {
- goPackagePath = "github.com/smallstep/assert";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/assert";
- rev = "de77670473b5492f5d0bce155b5c01534c2d13f7";
- sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16";
- };
- }
- {
- goPackagePath = "github.com/smallstep/cli";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/cli";
- rev = "eeecaac062cb548ee2ab7c7563bc3c2f2160f019";
- sha256 = "1khhd1vgwqb08vki1nh0k4i2yk6jjdqmnq4f8anqn125zsj7hvdk";
- };
- }
- {
- goPackagePath = "github.com/smallstep/nosql";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/nosql";
- rev = "f80b3f432de0662f07ebd58fe52b0a119fe5dcd9";
- sha256 = "155blxdgaprl1py5g8p52gipp0ckz3k6v41hgsp83nay01yynafb";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
- sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
- };
- }
- {
- goPackagePath = "go.etcd.io/bbolt";
- fetch = {
- type = "git";
- url = "https://github.com/etcd-io/bbolt";
- rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461";
- sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06";
- sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
- sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89";
- sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
- sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610";
- sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll";
- };
- }
- {
- goPackagePath = "gopkg.in/square/go-jose.v2";
- fetch = {
- type = "git";
- url = "https://github.com/square/go-jose";
- rev = "730df5f748271903322feb182be83b43ebbbe27d";
- sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3";
- };
- }
-]
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix
index d696b560f6..2b6ec57bbf 100644
--- a/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/step-cli/default.nix
@@ -1,19 +1,26 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "step-cli";
- version = "0.13.3";
-
- goPackagePath = "github.com/smallstep/cli";
+ version = "0.15.3-22-g3ddc5aa";
+ # 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
- rev = "v${version}";
- sha256 = "0b5hk9a8yq1nyh8m1gmf28yiha95xwsc4dk321g84hvai7g47pbr";
+ rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3";
+ sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0";
};
- goDeps = ./deps.nix;
+ preCheck = ''
+ # Tries to connect to smallstep.com
+ rm command/certificate/remote_test.go
+ '';
+ vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
diff --git a/third_party/nixpkgs/pkgs/tools/security/step-cli/deps.nix b/third_party/nixpkgs/pkgs/tools/security/step-cli/deps.nix
deleted file mode 100644
index bae1ba070a..0000000000
--- a/third_party/nixpkgs/pkgs/tools/security/step-cli/deps.nix
+++ /dev/null
@@ -1,453 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/AndreasBriese/bbloom";
- fetch = {
- type = "git";
- url = "https://github.com/AndreasBriese/bbloom";
- rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815";
- sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds";
- };
- }
- {
- goPackagePath = "github.com/ThomasRooney/gexpect";
- fetch = {
- type = "git";
- url = "https://github.com/ThomasRooney/gexpect";
- rev = "5482f03509440585d13d8f648989e05903001842";
- sha256 = "04zan78ndabxlwsw2hdcqbz32435pw2s04ljza07jlxnxzjp4kws";
- };
- }
- {
- goPackagePath = "github.com/asaskevich/govalidator";
- fetch = {
- type = "git";
- url = "https://github.com/asaskevich/govalidator";
- rev = "ccb8e960c48f04d6935e72476ae4a51028f9e22f";
- sha256 = "1sih4yb6fqmdp5g6594yyida0qm7dvvqcfvf8pgikydkxyqb8g0k";
- };
- }
- {
- goPackagePath = "github.com/boombuler/barcode";
- fetch = {
- type = "git";
- url = "https://github.com/boombuler/barcode";
- rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d";
- sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd";
- };
- }
- {
- goPackagePath = "github.com/chzyer/readline";
- fetch = {
- type = "git";
- url = "https://github.com/chzyer/readline";
- rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
- sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
- };
- }
- {
- goPackagePath = "github.com/corpix/uarand";
- fetch = {
- type = "git";
- url = "https://github.com/corpix/uarand";
- rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4";
- sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/dgraph-io/badger";
- fetch = {
- type = "git";
- url = "https://github.com/dgraph-io/badger";
- rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9";
- sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx";
- };
- }
- {
- goPackagePath = "github.com/dgryski/go-farm";
- fetch = {
- type = "git";
- url = "https://github.com/dgryski/go-farm";
- rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3";
- sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix";
- };
- }
- {
- goPackagePath = "github.com/go-chi/chi";
- fetch = {
- type = "git";
- url = "https://github.com/go-chi/chi";
- rev = "0ebf7795c516423a110473652e9ba3a59a504863";
- sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1";
- };
- }
- {
- goPackagePath = "github.com/go-sql-driver/mysql";
- fetch = {
- type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "72cd26f257d44c1114970e19afddcd812016007e";
- sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
- sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
- };
- }
- {
- goPackagePath = "github.com/google/certificate-transparency-go";
- fetch = {
- type = "git";
- url = "https://github.com/google/certificate-transparency-go";
- rev = "3629d6846518309d22c16fee15d1007262a459d2";
- sha256 = "16vsq7dd2kbbk3vwlrhm3jrlg5kq16wf4iz6d1gnyc32s5fcy9d7";
- };
- }
- {
- goPackagePath = "github.com/icrowley/fake";
- fetch = {
- type = "git";
- url = "https://github.com/icrowley/fake";
- rev = "4178557ae428460c3780a381c824a1f3aceb6325";
- sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977";
- };
- }
- {
- goPackagePath = "github.com/juju/ansiterm";
- fetch = {
- type = "git";
- url = "https://github.com/juju/ansiterm";
- rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1";
- sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h";
- };
- }
- {
- goPackagePath = "github.com/kballard/go-shellquote";
- fetch = {
- type = "git";
- url = "https://github.com/kballard/go-shellquote";
- rev = "95032a82bc518f77982ea72343cc1ade730072f0";
- sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
- };
- }
- {
- goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
- fetch = {
- type = "git";
- url = "https://github.com/konsorten/go-windows-terminal-sequences";
- rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242";
- sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
- };
- }
- {
- goPackagePath = "github.com/kr/pty";
- fetch = {
- type = "git";
- url = "https://github.com/kr/pty";
- rev = "db8e3cd836b82e82e0a9c8edc6896967dd31374f";
- sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h";
- };
- }
- {
- goPackagePath = "github.com/lunixbochs/vtclean";
- fetch = {
- type = "git";
- url = "https://github.com/lunixbochs/vtclean";
- rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
- sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
- };
- }
- {
- goPackagePath = "github.com/manifoldco/promptui";
- fetch = {
- type = "git";
- url = "https://github.com/manifoldco/promptui";
- rev = "157c96fb638a14d268b305cf2012582431fcc410";
- sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
- sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
- sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
- };
- }
- {
- goPackagePath = "github.com/mmcloughlin/avo";
- fetch = {
- type = "git";
- url = "https://github.com/mmcloughlin/avo";
- rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7";
- sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d";
- };
- }
- {
- goPackagePath = "github.com/newrelic/go-agent";
- fetch = {
- type = "git";
- url = "https://github.com/newrelic/go-agent";
- rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba";
- sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "792786c7400a136282c1664665ae0a8db921c6c2";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/pquerna/otp";
- fetch = {
- type = "git";
- url = "https://github.com/pquerna/otp";
- rev = "b7b89250c468c06871d3837bee02e2d5c155ae19";
- sha256 = "0gsl9rh8awira21z6cj26c6swasskx03z66q72yjc1mpbvyg6han";
- };
- }
- {
- goPackagePath = "github.com/rs/xid";
- fetch = {
- type = "git";
- url = "https://github.com/rs/xid";
- rev = "15d26544def341f036c5f8dca987a4cbe575032c";
- sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j";
- };
- }
- {
- goPackagePath = "github.com/samfoo/ansi";
- fetch = {
- type = "git";
- url = "https://github.com/samfoo/ansi";
- rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73";
- sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz";
- };
- }
- {
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
- fetch = {
- type = "git";
- url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
- sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "ad15b42461921f1fb3529b058c6786c6a45d5162";
- sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606";
- };
- }
- {
- goPackagePath = "github.com/smallstep/assert";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/assert";
- rev = "de77670473b5492f5d0bce155b5c01534c2d13f7";
- sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16";
- };
- }
- {
- goPackagePath = "github.com/smallstep/certificates";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/certificates";
- rev = "effb490d276f33b8cdab661df8b57a8ded67e082";
- sha256 = "1i76bbm4rbpv4cw2ln36v0x74jjkss6j8pdh49hfvb75j2n32790";
- };
- }
- {
- goPackagePath = "github.com/smallstep/certinfo";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/certinfo";
- rev = "78e21b44234ef6ddeb58f5e8aad2ed09975b694a";
- sha256 = "0zrxql9173vzn7zirv4299j0vw2mzwknivrg8rzhdbkhvbfiql9q";
- };
- }
- {
- goPackagePath = "github.com/smallstep/nosql";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/nosql";
- rev = "a0934e12468769d8cbede3ed316c47a4b88de4ca";
- sha256 = "08bg0sgrhkzflyl0ybi8v2vmk8bfk5pmcyfrizpxssyql7k27fam";
- };
- }
- {
- goPackagePath = "github.com/smallstep/truststore";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/truststore";
- rev = "e16045d94a61ca04b60d5d246da3117e7eeb1ecf";
- sha256 = "15cv3dkn2npf6rwhkb575sdq089rf70rha8wrym4ygc8rjbgwbab";
- };
- }
- {
- goPackagePath = "github.com/smallstep/zcrypto";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/zcrypto";
- rev = "6bab21fcaafc3d150cf793b6d5f25fe32f49c80e";
- sha256 = "129az7k556lmnhh14ayrwzrp1y205zdgwk3rj1xcmgisx5irliqp";
- };
- }
- {
- goPackagePath = "github.com/smallstep/zlint";
- fetch = {
- type = "git";
- url = "https://github.com/smallstep/zlint";
- rev = "d84eaafe274f9dc1f811ebfbb073e18c466e2a44";
- sha256 = "1xm7b1wvbify20vk9f3kmgmi5mnj5x2z3czc0r4zylcqcwwjkfd6";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
- };
- }
- {
- goPackagePath = "github.com/urfave/cli";
- fetch = {
- type = "git";
- url = "https://github.com/urfave/cli";
- rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
- sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
- };
- }
- {
- goPackagePath = "github.com/weppos/publicsuffix-go";
- fetch = {
- type = "git";
- url = "https://github.com/weppos/publicsuffix-go";
- rev = "386050f8211b04c965721c3591e7d96650a1ea86";
- sha256 = "17nvc0m0azm418w4mcyk7r1qcik0099vjpn455ia0lxhbqbl701b";
- };
- }
- {
- goPackagePath = "go.etcd.io/bbolt";
- fetch = {
- type = "git";
- url = "https://github.com/etcd-io/bbolt";
- rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461";
- sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06";
- sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
- sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89";
- sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
- sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610";
- sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll";
- };
- }
- {
- goPackagePath = "gopkg.in/square/go-jose.v2";
- fetch = {
- type = "git";
- url = "https://github.com/square/go-jose";
- rev = "730df5f748271903322feb182be83b43ebbbe27d";
- sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3";
- };
- }
- {
- goPackagePath = "howett.net/plist";
- fetch = {
- type = "git";
- url = "https://gitlab.howett.net/go/plist.git";
- rev = "591f970eefbbeb04d7b37f334a0c4c3256e32876";
- sha256 = "1gr74rf6m8bgayf6mxcfaxb3cc49ldlhydzqfafx7di5nds5hxk9";
- };
- }
-]
diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
new file mode 100644
index 0000000000..3786637585
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
@@ -0,0 +1,33 @@
+{ buildGoModule
+, fetchFromGitHub
+, stdenv
+}:
+
+buildGoModule rec {
+ pname = "teler";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "kitabisa";
+ repo = "teler";
+ rev = "v${version}";
+ sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3";
+ };
+
+ vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz";
+
+ # test require internet access
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Real-time HTTP Intrusion Detection";
+ longDescription = ''
+ teler is an real-time intrusion detection and threat alert
+ based on web log that runs in a terminal with resources that
+ we collect and provide by the community.
+ '';
+ homepage = "https://github.com/kitabisa/teler";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index d23f291175..33d8bd029b 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -1886,6 +1886,10 @@ in
cppclean = callPackage ../development/tools/cppclean {};
+ credhub-cli = callPackage ../tools/admin/credhub-cli {
+ buildGoModule = buildGo114Module;
+ };
+
crex = callPackage ../tools/misc/crex { };
cri-tools = callPackage ../tools/virtualization/cri-tools {};
@@ -2609,7 +2613,9 @@ in
statserial = callPackage ../tools/misc/statserial { };
- step-ca = callPackage ../tools/security/step-ca { };
+ step-ca = callPackage ../tools/security/step-ca {
+ inherit (darwin.apple_sdk.frameworks) PCSC;
+ };
step-cli = callPackage ../tools/security/step-cli { };
@@ -5327,6 +5333,8 @@ in
mxisd = callPackage ../servers/mxisd { };
+ naabu = callPackage ../tools/security/naabu { };
+
nagstamon = callPackage ../tools/misc/nagstamon {
pythonPackages = python3Packages;
};
@@ -6433,6 +6441,8 @@ in
papertrail = callPackage ../tools/text/papertrail { };
+ pappl = callPackage ../applications/printing/pappl { };
+
par2cmdline = callPackage ../tools/networking/par2cmdline { };
parallel = callPackage ../tools/misc/parallel { };
@@ -6729,6 +6739,8 @@ in
proxychains = callPackage ../tools/networking/proxychains { };
+ proxify = callPackage ../tools/networking/proxify { };
+
proxytunnel = callPackage ../tools/misc/proxytunnel {
openssl = openssl_1_0_2;
};
@@ -7691,6 +7703,8 @@ in
pythonPackages = python3Packages;
};
+ teler = callPackage ../tools/security/teler { };
+
termius = callPackage ../applications/networking/termius { };
termplay = callPackage ../tools/misc/termplay { };
@@ -12501,7 +12515,8 @@ in
boost172 = callPackage ../development/libraries/boost/1.72.nix { };
boost173 = callPackage ../development/libraries/boost/1.73.nix { };
boost174 = callPackage ../development/libraries/boost/1.74.nix { };
- boost17x = boost174;
+ boost175 = callPackage ../development/libraries/boost/1.75.nix { };
+ boost17x = boost175;
boost = boost16x;
boost_process = callPackage ../development/libraries/boost-process { };
@@ -12807,6 +12822,8 @@ in
enet = callPackage ../development/libraries/enet { };
+ entt = callPackage ../development/libraries/entt { };
+
epoxy = callPackage ../development/libraries/epoxy {};
libesmtp = callPackage ../development/libraries/libesmtp { };
@@ -16426,16 +16443,14 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
- vtk = callPackage ../development/libraries/vtk {
+ vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT;
};
-
- vtk_7 = callPackage ../development/libraries/vtk/7.x.nix {
- stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
+ vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
@@ -16451,6 +16466,9 @@ in
CoreText IOSurface ImageIO OpenGL GLUT;
};
+ vtk = vtk_8;
+ vtkWithQt5 = vtk.override { enableQt = true; };
+
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
@@ -16458,8 +16476,6 @@ in
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
- vtkWithQt5 = vtk.override { qtLib = qt515; };
-
vxl = callPackage ../development/libraries/vxl {
libpng = libpng12;
stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
@@ -16468,6 +16484,7 @@ in
waffle = callPackage ../development/libraries/waffle { };
wally-cli = callPackage ../development/tools/wally-cli { };
+ zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { };
wavpack = callPackage ../development/libraries/wavpack { };
@@ -16573,6 +16590,8 @@ in
xdo = callPackage ../tools/misc/xdo { };
+ xed = callPackage ../development/libraries/xed { };
+
xineLib = callPackage ../development/libraries/xine-lib { };
xautolock = callPackage ../misc/screensavers/xautolock { };
@@ -18059,7 +18078,9 @@ in
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
- cpuset = callPackage ../os-specific/linux/cpuset { };
+ cpuset = callPackage ../os-specific/linux/cpuset {
+ pythonPackages = python3Packages;
+ };
criu = callPackage ../os-specific/linux/criu { };
@@ -19905,6 +19926,8 @@ in
national-park-typeface = callPackage ../data/fonts/national-park { };
+ netease-music-tui = callPackage ../applications/audio/netease-music-tui { };
+
nordic = callPackage ../data/themes/nordic { };
nordic-polar = callPackage ../data/themes/nordic-polar { };
@@ -23123,6 +23146,8 @@ in
station = callPackage ../applications/networking/station { };
+ stochas = callPackage ../applications/audio/stochas { };
+
synapse = callPackage ../applications/misc/synapse { };
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 39e203aa17..330abc91db 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -13499,6 +13499,22 @@ let
};
};
+ MojoSAML = buildPerlModule {
+ pname = "Mojo-SAML";
+ version = "0.07";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-SAML-0.07.tar.gz";
+ sha256 = "03biykpz281z9nmd846jlxwzbaqlqwvh987aw9spl7bgvfn4rhkj";
+ };
+ buildInputs = [ ModuleBuildTiny ];
+ propagatedBuildInputs = [ CryptOpenSSLRSA CryptOpenSSLX509 DataGUID Mojolicious XMLCanonicalizeXML ];
+ meta = {
+ description = "A SAML2 toolkit using the Mojo toolkit";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
MojoSQLite = buildPerlModule {
pname = "Mojo-SQLite";
version = "3.004";
@@ -22888,6 +22904,21 @@ let
};
};
+ XMLCanonicalizeXML = buildPerlPackage {
+ pname = "XML-CanonicalizeXML";
+ version = "0.10";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/S/SJ/SJZASADA/XML-CanonicalizeXML-0.10.tar.gz";
+ sha256 = "1vl6wbqmq91mc0hkgfwlndbxcv2jm01hj7kpzprw3d6bh144ca77";
+ };
+ buildInputs = [ pkgs.libxml2 ];
+ meta = {
+ description = "Perl extension for inclusive (1.0 and 1.1) and exclusive canonicalization of XML using libxml2";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.sgo ];
+ };
+ };
+
XMLDescent = buildPerlModule {
pname = "XML-Descent";
version = "1.04";
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 440b53aaf2..71c53e238f 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -7746,8 +7746,17 @@ in {
vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };
- vtk = toPythonModule (pkgs.vtk_7.override {
- inherit (self) python;
+ vtk = self.vtk_7;
+ vtk_7 = toPythonModule (pkgs.vtk_7.override {
+ pythonInterpreter = python;
+ enablePython = true;
+ });
+ vtk_8 = toPythonModule (pkgs.vtk_8.override {
+ pythonInterpreter = python;
+ enablePython = true;
+ });
+ vtk_9 = toPythonModule (pkgs.vtk_9.override {
+ pythonInterpreter = python;
enablePython = true;
});