diff --git a/lib/path/README.md b/lib/path/README.md
index 87e552d120d7..89eec18b1130 100644
--- a/lib/path/README.md
+++ b/lib/path/README.md
@@ -187,6 +187,27 @@ Decision: All functions remove trailing slashes in their results.
+### Prefer returning subpaths over components
+[subpath-preference]: #prefer-returning-subpaths-over-components
+
+Observing: Functions could return subpaths or lists of path component strings.
+
+Considering: Subpaths are used as inputs for some functions. Using them for outputs, too, makes the library more consistent and composable.
+
+Decision: Subpaths should be preferred over list of path component strings.
+
+
+Arguments
+
+- (+) It is consistent with functions accepting subpaths, making the library more composable
+- (-) It is less efficient when the components are needed, because after creating the normalised subpath string, it will have to be parsed into components again
+ - (+) If necessary, we can still make it faster by adding builtins to Nix
+ - (+) Alternatively if necessary, versions of these functions that return components could later still be introduced.
+- (+) It makes the path library simpler because there's only two types (paths and subpaths). Only `lib.path.subpath.components` can be used to get a list of components.
+ And once we have a list of component strings, `lib.lists` and `lib.strings` can be used to operate on them.
+ For completeness, `lib.path.subpath.join` allows converting the list of components back to a subpath.
+
+
## Other implementations and references
- [Rust](https://doc.rust-lang.org/std/path/struct.Path.html)
diff --git a/lib/path/default.nix b/lib/path/default.nix
index 24a7f85affc1..5c6c5f608954 100644
--- a/lib/path/default.nix
+++ b/lib/path/default.nix
@@ -438,6 +438,37 @@ in /* No rec! Add dependencies on this file at the top. */ {
${subpathInvalidReason path}''
) 0 subpaths;
+ /*
+ Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings.
+ Throw an error if the subpath isn't valid.
+ Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise).
+
+ Laws:
+
+ - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise):
+
+ subpath.join (subpath.components s) == subpath.normalise s
+
+ Type:
+ subpath.components :: String -> [ String ]
+
+ Example:
+ subpath.components "."
+ => [ ]
+
+ subpath.components "./foo//bar/./baz/"
+ => [ "foo" "bar" "baz" ]
+
+ subpath.components "/foo"
+ =>
+ */
+ subpath.components =
+ subpath:
+ assert assertMsg (isValid subpath) ''
+ lib.path.subpath.components: Argument is not a valid subpath string:
+ ${subpathInvalidReason subpath}'';
+ splitRelPath subpath;
+
/* Normalise a subpath. Throw an error if the subpath isn't valid, see
`lib.path.subpath.isValid`
diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix
index 8bfb6f201219..bad6560f13a9 100644
--- a/lib/path/tests/unit.nix
+++ b/lib/path/tests/unit.nix
@@ -238,6 +238,19 @@ let
expr = (builtins.tryEval (subpath.normalise "..")).success;
expected = false;
};
+
+ testSubpathComponentsExample1 = {
+ expr = subpath.components ".";
+ expected = [ ];
+ };
+ testSubpathComponentsExample2 = {
+ expr = subpath.components "./foo//bar/./baz/";
+ expected = [ "foo" "bar" "baz" ];
+ };
+ testSubpathComponentsExample3 = {
+ expr = (builtins.tryEval (subpath.components "/foo")).success;
+ expected = false;
+ };
};
in
if cases == [] then "Unit tests successful"
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index b8d2bfe0ffca..ec88de6da3ba 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -15,6 +15,7 @@ let
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
+ WORK_PATH = ${cfg.stateDir}
${generators.toINI {} cfg.settings}
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 05fed0f4b473..46fc715d0891 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -29,23 +29,49 @@ let
ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ];
})));
};
- services.dhcpd4 = {
- enable = true;
- interfaces = map (n: "eth${toString n}") vlanIfs;
- extraConfig = flip concatMapStrings vlanIfs (n: ''
- subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
- option routers 192.168.${toString n}.1;
- range 192.168.${toString n}.3 192.168.${toString n}.254;
- }
- '')
- ;
- machines = flip map vlanIfs (vlan:
- {
- hostName = "client${toString vlan}";
- ethernetAddress = qemu-common.qemuNicMac vlan 1;
- ipAddress = "192.168.${toString vlan}.2";
- }
- );
+ services.kea = {
+ dhcp4 = {
+ enable = true;
+ settings = {
+ interfaces-config = {
+ interfaces = map (n: "eth${toString n}") vlanIfs;
+ dhcp-socket-type = "raw";
+ service-sockets-require-all = true;
+ service-sockets-max-retries = 5;
+ service-sockets-retry-wait-time = 2500;
+ };
+ subnet4 = map (n: {
+ id = n;
+ subnet = "192.168.${toString n}.0/24";
+ pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }];
+ option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }];
+
+ reservations = [{
+ hw-address = qemu-common.qemuNicMac n 1;
+ hostname = "client${toString n}";
+ ip-address = "192.168.${toString n}.2";
+ }];
+ }) vlanIfs;
+ };
+ };
+ dhcp6 = {
+ enable = true;
+ settings = {
+ interfaces-config = {
+ interfaces = map (n: "eth${toString n}") vlanIfs;
+ service-sockets-require-all = true;
+ service-sockets-max-retries = 5;
+ service-sockets-retry-wait-time = 2500;
+ };
+
+ subnet6 = map (n: {
+ id = n;
+ subnet = "fd00:1234:5678:${toString n}::/64";
+ interface = "eth${toString n}";
+ pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }];
+ }) vlanIfs;
+ };
+ };
};
services.radvd = {
enable = true;
@@ -61,17 +87,6 @@ let
};
'');
};
- services.dhcpd6 = {
- enable = true;
- interfaces = map (n: "eth${toString n}") vlanIfs;
- extraConfig = ''
- authoritative;
- '' + flip concatMapStrings vlanIfs (n: ''
- subnet6 fd00:1234:5678:${toString n}::/64 {
- range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2;
- }
- '');
- };
};
testCases = {
@@ -117,8 +132,9 @@ let
client.wait_for_unit("network.target")
router.wait_for_unit("network-online.target")
- with subtest("Make sure dhcpcd is not started"):
- client.fail("systemctl status dhcpcd.service")
+ with subtest("Make sure DHCP server is not started"):
+ client.fail("systemctl status kea-dhcp4-server.service")
+ client.fail("systemctl status kea-dhcp6-server.service")
with subtest("Test vlan 1"):
client.wait_until_succeeds("ping -c 1 192.168.1.1")
@@ -1035,7 +1051,7 @@ let
testScript = ''
machine.succeed("udevadm settle")
print(machine.succeed("ip link show dev enCustom"))
- machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01")
+ machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01")
'';
};
};
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index ebf72588df0d..a5d1a783b412 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -107,5 +107,6 @@ mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
+ mainProgram = "cadence";
};
}
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 752e1d2dfcfa..e898f17d9345 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ offline mirrexagon ];
platforms = platforms.linux;
+ mainProgram = "cava";
};
}
diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix
index faffd14576ae..ac286d499f1a 100644
--- a/pkgs/applications/audio/easyeffects/default.nix
+++ b/pkgs/applications/audio/easyeffects/default.nix
@@ -107,5 +107,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
+ mainProgram = "easyeffects";
};
}
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix
index c293c3384d57..76a1ce2d27ea 100644
--- a/pkgs/applications/audio/helvum/default.nix
+++ b/pkgs/applications/audio/helvum/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ fufexan ];
platforms = platforms.linux;
+ mainProgram = "helvum";
};
}
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 005bef77d456..34dbf0318a71 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ lovesegfault ];
platforms = platforms.linux;
+ mainProgram = "lollypop";
};
}
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index cebf08f19084..9f7d8a06e206 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
+ mainProgram = "mpc";
};
}
diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix
index 35fe314958c7..92f66d375d3b 100644
--- a/pkgs/applications/audio/mpdevil/default.nix
+++ b/pkgs/applications/audio/mpdevil/default.nix
@@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ apfelkuchen6 ];
+ mainProgram = "mpdevil";
};
}
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index e97bb2c130e5..e88ce8c9e339 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 ];
platforms = platforms.all;
+ mainProgram = "ncmpcpp";
};
}
diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock b/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
index 50af298c2a0c..0fd4e15861db 100644
--- a/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
+++ b/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock
@@ -10,24 +10,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
[[package]]
-name = "anyhow"
-version = "1.0.66"
+name = "android-tzdata"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "async-channel"
-version = "1.7.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
"event-listener",
@@ -36,9 +51,9 @@ dependencies = [
[[package]]
name = "atomic_refcell"
-version = "0.1.8"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d"
+checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
[[package]]
name = "atty"
@@ -59,15 +74,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "base64"
-version = "0.13.1"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "bit_field"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bitflags"
@@ -83,15 +92,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytemuck"
-version = "1.12.1"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
@@ -101,25 +110,19 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
-
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-rs"
-version = "0.16.1"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c"
+checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
dependencies = [
"bitflags",
"cairo-sys-rs",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"thiserror",
@@ -127,11 +130,11 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d"
+checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"system-deps",
]
@@ -144,17 +147,21 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
[[package]]
name = "cc"
-version = "1.0.73"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+dependencies = [
+ "libc",
+]
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -163,6 +170,21 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "time 0.1.45",
+ "wasm-bindgen",
+ "winapi",
+]
+
[[package]]
name = "color_quant"
version = "1.1.0"
@@ -171,13 +193,47 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "concurrent-queue"
-version = "1.2.4"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
- "cache-padded",
+ "crossbeam-utils",
]
+[[package]]
+name = "cookie"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+dependencies = [
+ "percent-encoding",
+ "time 0.3.25",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5a18f35792056f8c7c2de9c002e7e4fe44c7b5f66e7d99f46468dbb730a7ea7"
+dependencies = [
+ "cookie",
+ "idna 0.3.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time 0.3.25",
+ "url",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
[[package]]
name = "crc32fast"
version = "1.3.2"
@@ -187,55 +243,15 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "scopeguard",
-]
-
[[package]]
name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
[[package]]
name = "curl"
version = "0.4.44"
@@ -253,9 +269,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.58+curl-7.86.0"
+version = "0.4.65+curl-8.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e"
+checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
dependencies = [
"cc",
"libc",
@@ -278,25 +294,25 @@ dependencies = [
]
[[package]]
-name = "either"
-version = "1.8.0"
+name = "deranged"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
[[package]]
name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if",
]
[[package]]
name = "env_logger"
-version = "0.9.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272"
+checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
"humantime",
@@ -305,27 +321,18 @@ dependencies = [
"termcolor",
]
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
[[package]]
name = "event-listener"
version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-[[package]]
-name = "exr"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded"
-dependencies = [
- "bit_field",
- "flume",
- "half",
- "lebe",
- "miniz_oxide 0.6.2",
- "smallvec",
- "threadpool",
-]
-
[[package]]
name = "fastrand"
version = "1.8.0"
@@ -336,10 +343,19 @@ dependencies = [
]
[[package]]
-name = "field-offset"
-version = "0.3.4"
+name = "fdeflate"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
"rustc_version",
@@ -347,25 +363,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.24"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
- "miniz_oxide 0.5.4",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "pin-project",
- "spin",
+ "miniz_oxide",
]
[[package]]
@@ -391,39 +394,33 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -432,15 +429,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
"fastrand",
"futures-core",
@@ -453,32 +450,26 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
-[[package]]
-name = "futures-sink"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
-
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-core",
"futures-macro",
@@ -490,57 +481,57 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.16.0"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6"
+checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2"
+checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
dependencies = [
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "gdk4"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358"
+checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9"
dependencies = [
"bitflags",
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"pango",
]
[[package]]
name = "gdk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2"
+checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"pango-sys",
"pkg-config",
@@ -549,15 +540,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
- "wasi",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
@@ -580,21 +569,11 @@ dependencies = [
"temp-dir",
]
-[[package]]
-name = "gif"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
[[package]]
name = "gio"
-version = "0.16.2"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1debf8d0315d69be0153aa76249db3c858ef69b7778ad3cc669e6d370c485"
+checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
dependencies = [
"bitflags",
"futures-channel",
@@ -602,7 +581,7 @@ dependencies = [
"futures-io",
"futures-util",
"gio-sys",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"pin-project-lite",
@@ -612,12 +591,12 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c"
+checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
"winapi",
@@ -634,7 +613,7 @@ dependencies = [
"futures-core",
"futures-executor",
"futures-task",
- "glib-macros 0.15.11",
+ "glib-macros 0.15.13",
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
@@ -645,9 +624,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.16.2"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5abffa711471e015eb93d65d6ea20e7e9f6f7951fc0a1042280439319b2de06"
+checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba"
dependencies = [
"bitflags",
"futures-channel",
@@ -656,9 +635,9 @@ dependencies = [
"futures-task",
"futures-util",
"gio-sys",
- "glib-macros 0.16.0",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-macros 0.16.8",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"once_cell",
"smallvec",
@@ -667,9 +646,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.11"
+version = "0.15.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
+checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
dependencies = [
"anyhow",
"heck",
@@ -677,14 +656,14 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-macros"
-version = "0.16.0"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572"
+checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b"
dependencies = [
"anyhow",
"heck",
@@ -692,7 +671,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -707,9 +686,9 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021"
+checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
dependencies = [
"libc",
"system-deps",
@@ -728,33 +707,33 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3"
+checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "graphene-rs"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8"
+checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
dependencies = [
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-sys",
"libc",
]
[[package]]
name = "graphene-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163"
+checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
dependencies = [
- "glib-sys 0.16.0",
+ "glib-sys 0.16.3",
"libc",
"pkg-config",
"system-deps",
@@ -762,14 +741,14 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55"
+checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491"
dependencies = [
"bitflags",
"cairo-rs",
"gdk4",
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-rs",
"gsk4-sys",
"libc",
@@ -778,14 +757,14 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d"
+checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"graphene-sys",
"libc",
"pango-sys",
@@ -794,16 +773,16 @@ dependencies = [
[[package]]
name = "gstreamer"
-version = "0.19.1"
+version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e428081934c617115320750b7827f8f13131d9c3ae90b647c14a5d6019f47b4"
+checksum = "85fc926d081923c840403ec5ec3b2157a7cd236a2587c3031a4f0206f13ed500"
dependencies = [
"bitflags",
"cfg-if",
"futures-channel",
"futures-core",
"futures-util",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer-sys",
"libc",
"muldiv",
@@ -818,14 +797,14 @@ dependencies = [
[[package]]
name = "gstreamer-base"
-version = "0.19.1"
+version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "326674197c010e91a98d0f55a032abe22b1fd932456dbcdc3415450b4b653817"
+checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0"
dependencies = [
"atomic_refcell",
"bitflags",
"cfg-if",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
"gstreamer-base-sys",
"libc",
@@ -833,40 +812,40 @@ dependencies = [
[[package]]
name = "gstreamer-base-sys"
-version = "0.19.0"
+version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd55d3858fa65a99286c1cbe8db001f4ce5cff6a038f1c1253f5d99f840970de"
+checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-sys",
"libc",
"system-deps",
]
[[package]]
-name = "gstreamer-player"
-version = "0.19.0"
+name = "gstreamer-play"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796e053b45803544c37a150ae6cbedc8019bc5f410dff78aa6041e7a1a969f2b"
+checksum = "7788ccf29b0311c272c7144e425bff8f15af38bcaca44b7e2229f4d36a266093"
dependencies = [
"bitflags",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
- "gstreamer-player-sys",
+ "gstreamer-play-sys",
"gstreamer-video",
"libc",
"once_cell",
]
[[package]]
-name = "gstreamer-player-sys"
-version = "0.19.0"
+name = "gstreamer-play-sys"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7930b84f995cf393906ee8499d7bf643aba1899ace61e20fee0ea416ad532f32"
+checksum = "a347e1ef8b62364451312f440c233a55ddaec94539d058553335677fa4bb151c"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-sys",
"gstreamer-video-sys",
"libc",
@@ -875,26 +854,26 @@ dependencies = [
[[package]]
name = "gstreamer-sys"
-version = "0.19.0"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbaafc66df32b334d4aa28025fd5d83cadc971e1910205e140ea070f4ac4834f"
+checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "gstreamer-video"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b96daff8a3d853588e61207afac81a4879f3972430f6609721601ab757d7fd"
+checksum = "eb19dcbdd5436483e764318bef157070f192acc5b1199e85878723a9ce33d4e3"
dependencies = [
"bitflags",
"cfg-if",
"futures-channel",
- "glib 0.16.2",
+ "glib 0.16.9",
"gstreamer",
"gstreamer-base",
"gstreamer-video-sys",
@@ -904,12 +883,12 @@ dependencies = [
[[package]]
name = "gstreamer-video-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066ee44cd8d84f19a18c646128c1890878c034d3fb9f34d8d5f07311bbd9f41f"
+checksum = "7546bc798c898f2083330d81a7efff48f65a31b03873f410538032d26ec0cdc7"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gstreamer-base-sys",
"gstreamer-sys",
"libc",
@@ -918,9 +897,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.5.1"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47223ddb27033731b71ea841d1b878bd87a275a865f1df60b41505f9e4933d64"
+checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e"
dependencies = [
"bitflags",
"cairo-rs",
@@ -929,7 +908,7 @@ dependencies = [
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"graphene-rs",
"gsk4",
"gtk4-macros",
@@ -941,30 +920,30 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.5.0"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b"
+checksum = "42829d621396a69b352d80b952dfcb4ecb4272506b2e10a65457013af1b395a4"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.5.0"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c"
+checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk4-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"graphene-sys",
"gsk4-sys",
"libc",
@@ -973,19 +952,16 @@ dependencies = [
]
[[package]]
-name = "half"
-version = "2.1.0"
+name = "hashbrown"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554"
-dependencies = [
- "crunchy",
-]
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "heck"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
@@ -1004,18 +980,18 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "html-escape"
-version = "0.2.11"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e7479fa1ef38eb49fb6a42c426be515df2d063f06cb8efd3e50af073dbc26c"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
dependencies = [
"utf8-width",
]
[[package]]
name = "http"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -1034,6 +1010,29 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "idna"
version = "0.3.0"
@@ -1045,22 +1044,37 @@ dependencies = [
]
[[package]]
-name = "image"
-version = "0.24.4"
+name = "idna"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
"num-rational",
"num-traits",
"png",
- "scoped_threadpool",
- "tiff",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
]
[[package]]
@@ -1102,24 +1116,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
-dependencies = [
- "rayon",
-]
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "js-sys"
-version = "0.3.60"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
@@ -1130,24 +1135,18 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
-
[[package]]
name = "libadwaita"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3"
+checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
dependencies = [
"bitflags",
"futures-channel",
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"gtk4",
"libadwaita-sys",
"libc",
@@ -1157,14 +1156,14 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952"
+checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
dependencies = [
"gdk4-sys",
"gio-sys",
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"gtk4-sys",
"libc",
"pango-sys",
@@ -1173,15 +1172,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.137"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libdbus-sys"
-version = "0.2.2"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
dependencies = [
"pkg-config",
]
@@ -1198,9 +1197,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.8"
+version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
"libc",
@@ -1221,24 +1220,11 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "malloc_buf"
@@ -1257,35 +1243,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
-version = "0.5.4"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
+ "simd-adler32",
]
[[package]]
@@ -1300,23 +1278,14 @@ dependencies = [
[[package]]
name = "muldiv"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3"
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
-]
+checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
[[package]]
name = "netease-cloud-music-api"
-version = "1.0.2"
-source = "git+https://github.com/gmg137/netease-cloud-music-api.git#08e08044a0726bcd2e0d01035b972cb7f7b56ae8"
+version = "1.2.0"
+source = "git+https://github.com/gmg137/netease-cloud-music-api.git?tag=1.2.0#519ab225a64a57e7a21b1060390d3bd6c651d1a8"
dependencies = [
"anyhow",
"base64",
@@ -1333,15 +1302,16 @@ dependencies = [
[[package]]
name = "netease-cloud-music-gtk4"
-version = "2.0.3"
+version = "2.2.0"
dependencies = [
"anyhow",
+ "chrono",
+ "cookie_store",
"env_logger",
"fastrand",
- "fragile",
"gettext-rs",
"gstreamer",
- "gstreamer-player",
+ "gstreamer-play",
"gtk4",
"libadwaita",
"log",
@@ -1375,23 +1345,13 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "objc"
version = "0.2.7"
@@ -1423,15 +1383,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "openssl"
-version = "0.10.42"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
"bitflags",
"cfg-if",
@@ -1444,13 +1404,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
@@ -1461,11 +1421,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.77"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -1483,13 +1442,13 @@ dependencies = [
[[package]]
name = "pango"
-version = "0.16.0"
+version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798"
+checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
dependencies = [
"bitflags",
"gio",
- "glib 0.16.2",
+ "glib 0.16.9",
"libc",
"once_cell",
"pango-sys",
@@ -1497,69 +1456,59 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.16.0"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d"
+checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
dependencies = [
- "glib-sys 0.16.0",
- "gobject-sys 0.16.0",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
"libc",
"system-deps",
]
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "paste"
-version = "1.0.9"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -1569,41 +1518,44 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "png"
-version = "0.17.6"
+version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
+checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
dependencies = [
"bitflags",
"crc32fast",
+ "fdeflate",
"flate2",
- "miniz_oxide 0.5.4",
+ "miniz_oxide",
]
[[package]]
name = "polling"
-version = "2.4.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
+ "bitflags",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "winapi",
+ "pin-project-lite",
+ "windows-sys",
]
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "pretty-hex"
@@ -1613,13 +1565,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
[[package]]
name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
]
[[package]]
@@ -1631,7 +1582,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1648,18 +1599,34 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
[[package]]
-name = "qrcode-generator"
-version = "4.1.6"
+name = "psl-types"
+version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501c33c9127afb867693646b38817bf63a9a756d4b66aefbc5c0d7e5e8c3125a"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
+[[package]]
+name = "publicsuffix"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+dependencies = [
+ "idna 0.3.0",
+ "psl-types",
+]
+
+[[package]]
+name = "qrcode-generator"
+version = "4.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76"
dependencies = [
"html-escape",
"image",
@@ -1674,9 +1641,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@@ -1711,35 +1678,11 @@ dependencies = [
"getrandom",
]
-[[package]]
-name = "rayon"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
@@ -1748,90 +1691,65 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rustc_version"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]]
name = "ryu"
-version = "1.0.11"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "schannel"
-version = "0.1.20"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "lazy_static",
"windows-sys",
]
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
[[package]]
name = "serde"
-version = "1.0.147"
+version = "1.0.181"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.147"
+version = "1.0.181"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "serde_json"
-version = "1.0.87"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -1839,10 +1757,25 @@ dependencies = [
]
[[package]]
-name = "slab"
-version = "0.4.7"
+name = "serde_spanned"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
@@ -1860,34 +1793,36 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
"winapi",
]
[[package]]
-name = "spin"
-version = "0.9.4"
+name = "syn"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "lock_api",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
]
[[package]]
name = "syn"
-version = "1.0.103"
+version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@@ -1896,9 +1831,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
dependencies = [
"cfg-expr",
"heck",
@@ -1907,6 +1842,12 @@ dependencies = [
"version-compare",
]
+[[package]]
+name = "target-lexicon"
+version = "0.12.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+
[[package]]
name = "temp-dir"
version = "0.1.11"
@@ -1915,51 +1856,70 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
-version = "1.0.37"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
-name = "threadpool"
-version = "1.8.1"
+name = "time"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
- "num_cpus",
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
]
[[package]]
-name = "tiff"
-version = "0.7.3"
+name = "time"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
+ "deranged",
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+dependencies = [
+ "time-core",
]
[[package]]
@@ -1973,17 +1933,42 @@ dependencies = [
[[package]]
name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml"
-version = "0.5.9"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
]
[[package]]
@@ -2001,20 +1986,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
]
@@ -2029,23 +2014,17 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
@@ -2058,12 +2037,12 @@ dependencies = [
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
- "idna",
+ "idna 0.4.0",
"percent-encoding",
]
@@ -2087,9 +2066,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version-compare"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
[[package]]
name = "version_check"
@@ -2103,6 +2082,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -2111,9 +2096,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2121,24 +2106,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2146,37 +2131,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "weezl"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "winapi"
@@ -2210,44 +2180,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+dependencies = [
+ "windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807"
+dependencies = [
+ "memchr",
+]
diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
index 8a83da7ff529..9a9d9ee8cc93 100644
--- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
+++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix
@@ -23,22 +23,26 @@
stdenv.mkDerivation rec {
pname = "netease-cloud-music-gtk";
- version = "2.0.3";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "gmg137";
repo = pname;
rev = version;
- hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc=";
+ hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "netease-cloud-music-api-1.0.2" = "sha256-7Yp2ZBg5wHnDPtdPLwZQnqcSlVuGCrXpV5M/dp/IaOE=";
+ "netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY=";
};
};
+ postPatch = ''
+ cp ${./Cargo.lock} Cargo.lock
+ '';
+
nativeBuildInputs = [
meson
ninja
@@ -75,5 +79,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ diffumist ];
mainProgram = "netease-cloud-music-gtk4";
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index d57c56a2adb7..5cec295d0a75 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar globin ];
platforms = platforms.linux;
+ mainProgram = "pavucontrol";
};
}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 398d3a6ad970..df6d762c65ef 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -15,6 +15,7 @@ let
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "spotify";
};
in if stdenv.isDarwin
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index ee9cf4ff3d31..25193d1b78e4 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -116,5 +116,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ peterhoeg ];
# upstream says darwin should work but they lack maintainers as of 0.6.6
platforms = platforms.linux;
+ mainProgram = "strawberry";
};
}
diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix
index efac5170249e..4360defc18d4 100644
--- a/pkgs/applications/audio/tageditor/default.nix
+++ b/pkgs/applications/audio/tageditor/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
+ mainProgram = "tageditor";
};
}
diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index 802af13137fa..91cf74e65d0c 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -34,5 +34,6 @@ appimageTools.wrapType2 rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = platforms.linux;
maintainers = [ maintainers.aacebedo ];
+ mainProgram = "youtube-music";
};
}
diff --git a/pkgs/applications/audio/ytmdesktop/default.nix b/pkgs/applications/audio/ytmdesktop/default.nix
index be2b85199b7b..534bee41a983 100644
--- a/pkgs/applications/audio/ytmdesktop/default.nix
+++ b/pkgs/applications/audio/ytmdesktop/default.nix
@@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec {
license = licenses.cc0;
platforms = platforms.linux;
maintainers = [ maintainers.lgcl ];
+ mainProgram = "ytmdesktop";
};
}
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 91a60d5145b0..440184d959e0 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -32,6 +32,7 @@ let
matthewbauer
];
platforms = lib.platforms.all;
+ mainProgram = "emacs";
};
in
{
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 4f2b3f1eb332..4ecc511b6540 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ frlan ];
platforms = platforms.all;
+ mainProgram = "geany";
};
}
diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix
index f85bb9e5fdc1..4352b74f964d 100644
--- a/pkgs/applications/editors/gedit/default.nix
+++ b/pkgs/applications/editors/gedit/default.nix
@@ -96,5 +96,6 @@ stdenv.mkDerivation rec {
maintainers = [ ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
+ mainProgram = "gedit";
};
}
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix
index 081b038e2307..d4dbb4d97cca 100644
--- a/pkgs/applications/editors/micro/default.nix
+++ b/pkgs/applications/editors/micro/default.nix
@@ -41,5 +41,6 @@ buildGoModule rec {
description = "Modern and intuitive terminal-based text editor";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
+ mainProgram = "micro";
};
}
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index bd8049699514..5b51f9563c39 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -75,5 +75,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ joachifm nequissimus ];
platforms = platforms.all;
+ mainProgram = "nano";
};
}
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 728ab5eb54c9..24e9ea914b78 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -27,5 +27,6 @@ rec {
license = licenses.vim;
maintainers = with maintainers; [ das_j equirosa ];
platforms = platforms.unix;
+ mainProgram = "vim";
};
}
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2d5a4754af76..0402a7dacd54 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -9376,6 +9376,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
};
+ telescope-sg = buildVimPluginFrom2Nix {
+ pname = "telescope-sg";
+ version = "2023-08-02";
+ src = fetchFromGitHub {
+ owner = "Marskey";
+ repo = "telescope-sg";
+ rev = "df40e78ed1c1ba3cb3591a799c8e4292c88e1ff0";
+ sha256 = "0mqqh15jl7y4i1ycb5lpw9fvad4qm03vw5x7paxw8h2yzi39qp0p";
+ };
+ meta.homepage = "https://github.com/Marskey/telescope-sg/";
+ };
+
telescope-symbols-nvim = buildVimPluginFrom2Nix {
pname = "telescope-symbols.nvim";
version = "2023-02-19";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index aca91df2c53e..c44c338e82cd 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -787,6 +787,7 @@ https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
https://github.com/MrcJkb/telescope-manix/,HEAD,
https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
https://github.com/nvim-telescope/telescope-project.nvim/,,
+https://github.com/Marskey/telescope-sg/,HEAD,
https://github.com/nvim-telescope/telescope-symbols.nvim/,,
https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
https://github.com/fhill2/telescope-ultisnips.nvim/,,
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 8a95d10203c4..2a7e0e9ac0fc 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -151,5 +151,6 @@ mkDerivation rec {
license = licenses.gpl2;
homepage = "https://www.digikam.org";
platforms = platforms.linux;
+ mainProgram = "digikam";
};
}
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5ca19d5b41a1..4859fee52fd9 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
license = licenses.mit-feh;
maintainers = with maintainers; [ viric willibutz globin ma27 ];
platforms = platforms.unix;
+ mainProgram = "feh";
};
}
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index ec0ab074625d..3e1e482bb39c 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -159,6 +159,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.jtojnar ];
platforms = platforms.all;
+ mainProgram = "inkscape";
longDescription = ''
Inkscape is a feature-rich vector graphics editor that edits
files in the W3C SVG (Scalable Vector Graphics) file format.
diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix
index 00e53d3a82e3..4faa7a7eac2d 100644
--- a/pkgs/applications/misc/fluidd/default.nix
+++ b/pkgs/applications/misc/fluidd/default.nix
@@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
- sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4=";
+ sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix
index 02bae9322907..0aac8045023c 100644
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/pkgs/applications/misc/rofi-rbw/default.nix
@@ -31,5 +31,6 @@ buildPythonApplication rec {
license = licenses.mit;
maintainers = with maintainers; [ equirosa dit7ya ];
platforms = platforms.linux;
+ mainProgram = "rofi-rbw";
};
}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 3ed322797fc2..ee31f79a5752 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -89,7 +89,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "12.5.1";
+ version = "12.5.2";
lang = "ALL";
@@ -101,7 +101,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- hash = "sha256-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4=";
+ hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es=";
};
i686-linux = fetchurl {
@@ -111,7 +111,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- hash = "sha256-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8=";
+ hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso=";
};
};
diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/applications/networking/expressvpn/default.nix
index fa88705ad2e2..5334fc01ffc4 100644
--- a/pkgs/applications/networking/expressvpn/default.nix
+++ b/pkgs/applications/networking/expressvpn/default.nix
@@ -11,8 +11,8 @@
let
pname = "expressvpn";
- clientVersion = "3.25.0";
- clientBuild = "13";
+ clientVersion = "3.52.0";
+ clientBuild = "2";
version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ];
expressvpnBase = stdenvNoCC.mkDerivation {
@@ -20,7 +20,7 @@ let
src = fetchurl {
url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb";
- hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA=";
+ hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew=";
};
nativeBuildInputs = [ dpkg autoPatchelfHook ];
diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix
index f6fd6553c7f3..82da4dedc943 100644
--- a/pkgs/applications/networking/instant-messengers/armcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix
@@ -136,5 +136,6 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
maintainers = with maintainers; [ wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
+ mainProgram = "armcord";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
index c6e020cdc252..501d8f7d163f 100644
--- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
@@ -1,7 +1,7 @@
{ lib, callPackage, stdenvNoCC }:
let
pname = "caprine";
- version = "2.55.5";
+ version = "2.58.0";
metaCommon = with lib; {
description = "An elegant Facebook Messenger desktop app";
homepage = "https://sindresorhus.com/caprine";
@@ -10,16 +10,17 @@ let
};
x86_64-appimage = callPackage ./build-from-appimage.nix {
inherit pname version metaCommon;
- sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo=";
+ sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
- sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk=";
+ sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg=";
};
in
(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; };
meta = oldAttrs.meta // {
platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms;
+ mainProgram = "caprine";
};
})
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index e56a47a3ff4d..8bc1c7cb5984 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -61,6 +61,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "discord";
};
package =
if stdenv.isLinux
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 3f2d5a99fe67..f3ec46f3641c 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
license = licenses.asl20;
maintainers = teams.matrix.members;
inherit (electron.meta) platforms;
+ mainProgram = "element-desktop";
};
})
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index e2135734bd7f..99b8b4563d23 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -17,5 +17,6 @@ buildGoModule rec {
homepage = "https://github.com/erroneousboat/slack-term";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
+ mainProgram = "slack-term";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 44846df1c740..3a03a5fce847 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -85,6 +85,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ mmahut maxeaubrey ];
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
+ mainProgram = "slack";
};
linux = stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 1f21891c799e..be4334438c33 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -39,6 +39,7 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ liff tricktron ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+ mainProgram = "teams";
};
linux = stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 4de6ce1bce4c..7a7835ede42c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -209,5 +209,6 @@ stdenv.mkDerivation rec {
homepage = "https://desktop.telegram.org/";
changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ nickcao ];
+ mainProgram = "telegram-desktop";
};
}
diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix
new file mode 100644
index 000000000000..3f577289502a
--- /dev/null
+++ b/pkgs/applications/networking/p2p/flood/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+ pname = "flood";
+ version = "unstable-2023-06-03";
+
+ src = fetchFromGitHub {
+ owner = "jesec";
+ repo = pname;
+ rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074";
+ hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0=";
+ };
+
+ npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk=";
+
+ meta = with lib; {
+ description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
+ homepage = "https://flood.js.org";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ thiagokokada winter ];
+ };
+}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 9f379252fd52..5f4bc89db397 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }:
+{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }:
let
load_num =
@@ -15,19 +15,23 @@ let
exec ${ocaml}/bin/ocaml \
-I \`${camlp5}/bin/camlp5 -where\` \
${load_num} \
+ -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma
-init make.ml
'';
in
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+ "hol_light is not available for OCaml ${ocaml.version}"
+
stdenv.mkDerivation {
pname = "hol_light";
- version = "unstable-2019-10-06";
+ version = "unstable-2023-07-21";
src = fetchFromGitHub {
owner = "jrh13";
repo = "hol-light";
- rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
- sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
+ rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349";
+ hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E=";
};
patches = [
@@ -39,8 +43,8 @@ stdenv.mkDerivation {
strictDeps = true;
- nativeBuildInputs = [ ocaml camlp5 ];
- propagatedBuildInputs = [ num ];
+ nativeBuildInputs = [ ocaml findlib camlp5 ];
+ propagatedBuildInputs = [ camlp-streams num ];
installPhase = ''
mkdir -p "$out/lib/hol_light" "$out/bin"
diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix
new file mode 100644
index 000000000000..3ced362b946d
--- /dev/null
+++ b/pkgs/applications/video/vdr/markad/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, vdr
+, fetchFromGitHub
+, graphicsmagick
+, pcre
+, xorgserver
+, ffmpeg
+, libiconv
+, boost
+, libgcrypt
+, perl
+, util-linux
+, groff
+, libva
+, xorg
+, ncurses
+, callPackage
+}:
+stdenv.mkDerivation rec {
+ pname = "vdr-markad";
+ version = "3.3.3";
+
+ src = fetchFromGitHub {
+ repo = "vdr-plugin-markad";
+ owner = "kfb77";
+ sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI=";
+ rev = "V${version}";
+ };
+
+ buildInputs = [ vdr ffmpeg ];
+
+ postPatch = ''
+ substituteInPlace command/Makefile --replace '/usr' ""
+
+ substituteInPlace plugin/markad.cpp \
+ --replace "/usr/bin" "$out/bin" \
+ --replace "/var/lib/markad" "$out/var/lib/markad"
+
+ substituteInPlace command/markad-standalone.cpp \
+ --replace "/var/lib/markad" "$out/var/lib/markad"
+ '';
+
+ buildFlags = [
+ "DESTDIR=$(out)"
+ "VDRDIR=${vdr.dev}/lib/pkgconfig"
+ ];
+
+ installFlags = buildFlags;
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description = "Plugin for VDR that marks advertisements";
+ maintainers = [ maintainers.ck3d ];
+ license = licenses.gpl2;
+ inherit (vdr.meta) platforms;
+ };
+
+}
diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix
new file mode 100644
index 000000000000..b46723fbf848
--- /dev/null
+++ b/pkgs/applications/video/vdr/nopacity/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }:
+stdenv.mkDerivation rec {
+ pname = "vdr-skin-nopacity";
+ version = "1.1.14";
+
+ src = fetchFromGitLab {
+ repo = "SkinNopacity";
+ owner = "kamel5";
+ sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ=";
+ rev = version;
+ };
+
+ buildInputs = [ vdr graphicsmagick ];
+
+ installFlags = [ "DESTDIR=$(out)" ];
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description = "Highly customizable native true color skin for the Video Disc Recorder";
+ maintainers = [ maintainers.ck3d ];
+ license = licenses.gpl2;
+ inherit (vdr.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 404af2ec83b3..92d9128543f0 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, vdr, fetchFromGitHub
-, graphicsmagick, pcre, xorgserver, ffmpeg
-, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
+, graphicsmagick, pcre
+, boost, libgcrypt, perl, util-linux, groff, ncurses
, callPackage
}: let
mkPlugin = name: stdenv.mkDerivation {
@@ -12,6 +12,10 @@
};
in {
+ markad = callPackage ./markad {};
+
+ nopacity = callPackage ./nopacity {};
+
softhddevice = callPackage ./softhddevice {};
streamdev = callPackage ./streamdev {};
@@ -53,52 +57,6 @@ in {
};
- markad = stdenv.mkDerivation rec {
- pname = "vdr-markad";
- version = "3.1.1";
-
- src = fetchFromGitHub {
- repo = "vdr-plugin-markad";
- owner = "kfb77";
- sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M=";
- rev = "V${version}";
- };
-
- buildInputs = [ vdr ffmpeg ];
-
- postPatch = ''
- substituteInPlace command/Makefile --replace '/usr' ""
-
- substituteInPlace plugin/markad.cpp \
- --replace "/usr/bin" "$out/bin" \
- --replace "/var/lib/markad" "$out/var/lib/markad"
-
- substituteInPlace command/markad-standalone.cpp \
- --replace "/var/lib/markad" "$out/var/lib/markad"
- '';
-
- buildFlags = [
- "DESTDIR=$(out)"
- "LIBDIR=/lib/vdr"
- "BINDIR=/bin"
- "MANDIR=/share/man"
- "APIVERSION=${vdr.version}"
- "VDRDIR=${vdr.dev}/include/vdr"
- "LOCDIR=/share/locale"
- ];
-
- installFlags = buildFlags;
-
- meta = with lib; {
- inherit (src.meta) homepage;
- description = "MarkAd marks advertisements in VDR recordings.";
- maintainers = [ maintainers.ck3d ];
- license = licenses.gpl2;
- inherit (vdr.meta) platforms;
- };
-
- };
-
epgsearch = stdenv.mkDerivation rec {
pname = "vdr-epgsearch";
version = "2.4.2";
diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix
index b0ea1b04c258..1be01e63fc58 100644
--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@@ -12,12 +12,12 @@
}:
stdenv.mkDerivation rec {
pname = "vdr-softhddevice";
- version = "1.10.3";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "ua0lnj";
repo = "vdr-plugin-softhddevice";
- sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg=";
+ sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc=";
rev = "v${version}";
};
diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix
index 9e393f8e399c..11084b9025af 100644
--- a/pkgs/data/fonts/nerdfonts/shas.nix
+++ b/pkgs/data/fonts/nerdfonts/shas.nix
@@ -13,6 +13,7 @@
"DaddyTimeMono" = "1w5n170l63hfxh1xclw3jpf8amj60br6py4yx12yhqanp2zg0shj";
"DejaVuSansMono" = "1j22f5jnpmyli686r67c4c07g07ac78aq9wg8hy1vwblxfzdvq9f";
"DroidSansMono" = "13r1sglgwf05swnbn0mha2gpdqammzlg0p6h7c33af1vr7n8cnca";
+ "EnvyCodeR" = "1y03cb0kq548nm8qh4jh8yw2zpx6ahl0y8561c429p5f16707qxl";
"FantasqueSansMono" = "1k0p6gvas6mgwq0bbvpwbn3mm6yaaapgjqgk30fvpq9zvn4a26bf";
"FiraCode" = "14vbb3w6il32kd8my75vvv786azm7sxmdpba9np0qjx4rs8xdhbn";
"FiraMono" = "1iiz5cnhrb67793ww6pj5y5x9s1a5nlk9kqwbv92kxmbqakarlcb";
@@ -27,6 +28,7 @@
"Inconsolata" = "02rar6g3zbbpxxxz37v7d5qzafn59bhp04iv3wk16kqxy0havgx5";
"InconsolataGo" = "0nx6j3v2fvhdw3ygmz65zwlj6zwrkpmf59wfxirpzkcqqsdh4zwl";
"InconsolataLGC" = "00s2051fz3k6jnsfmnlqnd2cghr9sj2pddi5gpid1i5x006rig7a";
+ "IntelOneMono" = "02cynzrpn93b1kmi21p60lhdai6rppmm3m1f872kvf08damc1660";
"Iosevka" = "1byrmfbsqi06fsy958364jy694dnm7a7pcjsv64w6mwfsi5vjn1r";
"IosevkaTerm" = "1k65jfa0c7c6pvns7vfcxcfc3i1qcr6wg16qafbp9zggabbvl7aa";
"JetBrainsMono" = "0mbzvfl36a6mgb2dnjf8n3kkm28sz0xhv7s5lww141wpgj5jb4a9";
diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix
new file mode 100644
index 000000000000..77b352e33d9a
--- /dev/null
+++ b/pkgs/data/fonts/sketchybar-app-font/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "sketchybar-app-font";
+ version = "1.0.13";
+
+ src = fetchurl {
+ url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
+ hash = "sha256-vlvSrN6yxabKnzPmqI9VNkOdR3yLa1QUieZjOOW6w3c=";
+ };
+
+ dontUnpack = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm644 $src $out/share/fonts/truetype/sketchybar-app-font.ttf
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "A ligature-based symbol font and a mapping function for sketchybar";
+ longDescription = ''
+ A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons.
+ '';
+ homepage = "https://github.com/kvndrsslr/sketchybar-app-font";
+ license = lib.licenses.unlicense;
+ maintainers = with lib.maintainers; [ khaneliman ];
+ };
+})
diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix
index 113fad13600c..c103635d37af 100644
--- a/pkgs/development/guile-modules/guile-commonmark/default.nix
+++ b/pkgs/development/guile-modules/guile-commonmark/default.nix
@@ -4,22 +4,24 @@
, autoreconfHook
, guile
, pkg-config
+, texinfo
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "guile-commonmark";
- version = "0.1.2";
+ version = "unstable-2020-04-30";
src = fetchFromGitHub {
owner = "OrangeShark";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo=";
+ repo = "guile-commonmark";
+ rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468";
+ hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
+ texinfo # for makeinfo
];
buildInputs = [
guile
diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix
index b106b8ad1c94..84d53b66e19b 100644
--- a/pkgs/development/guile-modules/guile-git/default.nix
+++ b/pkgs/development/guile-modules/guile-git/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
libgit2 scheme-bytestructures
];
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
enableParallelBuilding = true;
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 6d6a88808e38..2678bcb2c058 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
preCheck = ''
# Make `libgcc_s.so' visible for `pthread_cancel'.
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index abfa144ee57c..f982ff600b8b 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "guile-ncurses";
- version = "1.7";
+ version = "3.1";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q=";
+ hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM=";
};
nativeBuildInputs = [
@@ -25,19 +25,20 @@ stdenv.mkDerivation rec {
ncurses
];
- preConfigure = ''
- configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site"
- '';
+ configureFlags = [
+ "--with-gnu-filesystem-hierarchy"
+ ];
- postFixup = ''
- for f in $out/share/guile/site/ncurses/**.scm; do \
- substituteInPlace $f \
- --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \
- done
- '';
-
- # Undefined symbols for architecture arm64: "_u32_conv_from_encoding"
- env.NIX_LDFLAGS = "-lunistring";
+ postFixup =
+ let
+ guileVersion = lib.versions.majorMinor guile.version;
+ in
+ ''
+ for f in $out/share/guile/site/ncurses/**.scm; do \
+ substituteInPlace $f \
+ --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \
+ done
+ '';
# XXX: 1 of 65 tests failed.
doCheck = false;
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index 1be51b03f1f6..c05ac442ced6 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.1.21";
- hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20=";
+ version = "8.1.22";
+ hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I=";
});
in
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 1b025afd95b7..a12feb9c4e14 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,12 +2,12 @@
let
base = (callPackage ./generic.nix (_args // {
- version = "8.3.0beta1";
+ version = "8.3.0beta2";
hash = null;
})).overrideAttrs (oldAttrs: {
src = fetchurl {
- url = "https://downloads.php.net/~eric/php-8.3.0beta1.tar.xz";
- hash = "sha256-eZjhwqkP1RkyzpV5uMUxUWkXiPERBgGtmaX65WhDdl8=";
+ url = "https://downloads.php.net/~jakub/php-8.3.0beta2.tar.xz";
+ hash = "sha256-ND1OlmSMtBxTE/0qfgy3Cz/gF08eIzydU2W/eKg58wQ=";
};
});
in
diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index 92fc02bfa2c9..4fbf6f3a6e39 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, meson
, ninja
, pkg-config
@@ -15,9 +14,9 @@
, vala
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gtk-layer-shell";
- version = "0.8.0";
+ version = "0.8.1";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # for demo
@@ -25,25 +24,10 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "wmww";
repo = "gtk-layer-shell";
- rev = "v${version}";
- sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE=";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM=";
};
- patches = [
- # https://github.com/wmww/gtk-layer-shell/pull/146
- # Mark wayland-scanner as a build-time dependency
- (fetchpatch {
- url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch";
- hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM=";
- })
- # https://github.com/wmww/gtk-layer-shell/pull/147
- # Remove redundant dependency check for gtk-doc
- (fetchpatch {
- url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch";
- hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs=";
- })
- ];
-
strictDeps = true;
depsBuildBuild = [
@@ -74,8 +58,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
+ homepage = "https://github.com/wmww/gtk-layer-shell";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ eonpatapon ];
+ maintainers = with maintainers; [ eonpatapon donovanglover ];
platforms = platforms.linux;
};
-}
+})
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 9507d3fce6d6..4601e04f03c9 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "movit";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchurl {
url = "https://movit.sesse.net/${pname}-${version}.tar.gz";
- sha256 = "sha256-I1l7k+pTdi1E33Y+zCtwIwj3b8Fzggmek4UiAIHOZhA=";
+ sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 05d996865fbf..437865eb70e1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -46,9 +46,11 @@ mapAliases {
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
eslint_d = pkgs.eslint_d; # Added 2023-05-26
+ flood = pkgs.flood; # Added 2023-07-25
gtop = pkgs.gtop; # added 2023-07-31
manta = pkgs.node-manta; # Added 2023-05-06
readability-cli = pkgs.readability-cli; # Added 2023-06-12
+ reveal-md = pkgs.reveal-md; # added 2023-07-31
thelounge = pkgs.thelounge; # Added 2023-05-22
triton = pkgs.triton; # Added 2023-05-06
typescript = pkgs.typescript; # Added 2023-06-21
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index 132024e58e68..c327b3b9a5bb 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -47,6 +47,7 @@
firebase-tools = "firebase";
fkill-cli = "fkill";
fleek-cli = "fleek";
+ flood = "flood";
git-run = "gr";
gitmoji-cli = "gitmoji";
graphql-cli = "graphql";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index da2f95ab848c..dd1fadae5603 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -140,7 +140,6 @@
, "fixjson"
, "fkill-cli"
, "fleek-cli"
-, "flood"
, "forever"
, "fx"
, "ganache"
@@ -272,7 +271,6 @@
, "redoc-cli"
, "remod-cli"
, "reveal.js"
-, "reveal-md"
, "rimraf"
, "rollup"
, {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 982bc9cb1445..b2893f98e679 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -107221,24 +107221,6 @@ in
bypassCache = true;
reconstructLock = true;
};
- flood = nodeEnv.buildNodePackage {
- name = "flood";
- packageName = "flood";
- version = "4.7.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz";
- sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA==";
- };
- buildInputs = globalBuildInputs;
- meta = {
- description = "A modern Web UI for various torrent clients with multi-user and multi-client support";
- homepage = "https://github.com/jesec/flood#readme";
- license = "GPL-3.0-only";
- };
- production = true;
- bypassCache = true;
- reconstructLock = true;
- };
forever = nodeEnv.buildNodePackage {
name = "forever";
packageName = "forever";
@@ -132227,315 +132209,6 @@ in
bypassCache = true;
reconstructLock = true;
};
- reveal-md = nodeEnv.buildNodePackage {
- name = "reveal-md";
- packageName = "reveal-md";
- version = "5.5.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.5.1.tgz";
- sha512 = "6M2jSP4HHEWKRmaeB7Sc7oyUffUL98NVeg9Z8mquJFBZqjBXdL39Du8RCrKgN31XwI8oiLaFs5jRiUzJnQiaTA==";
- };
- dependencies = [
- sources."@sindresorhus/is-0.14.0"
- sources."@szmarczak/http-timer-1.1.2"
- sources."accepts-1.3.8"
- sources."agent-base-4.3.0"
- sources."ansi-align-3.0.1"
- sources."ansi-regex-5.0.1"
- sources."ansi-styles-4.3.0"
- sources."anymatch-3.1.3"
- sources."argparse-1.0.10"
- sources."array-flatten-1.1.1"
- sources."async-limiter-1.0.1"
- sources."balanced-match-1.0.2"
- sources."binary-extensions-2.2.0"
- (sources."body-parser-1.20.1" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."ms-2.0.0"
- ];
- })
- sources."boxen-5.1.2"
- sources."brace-expansion-2.0.1"
- sources."braces-3.0.2"
- sources."buffer-crc32-0.2.13"
- sources."buffer-from-1.1.2"
- sources."bufferutil-4.0.7"
- sources."bytes-3.1.2"
- (sources."cacheable-request-6.1.0" // {
- dependencies = [
- sources."get-stream-5.2.0"
- sources."lowercase-keys-2.0.0"
- ];
- })
- sources."call-bind-1.0.2"
- sources."camelcase-6.3.0"
- sources."chalk-4.1.2"
- sources."chokidar-3.5.3"
- sources."ci-info-2.0.0"
- sources."cli-boxes-2.2.1"
- sources."clone-response-1.0.3"
- sources."color-convert-2.0.1"
- sources."color-name-1.1.4"
- sources."commander-6.2.1"
- sources."concat-map-0.0.1"
- sources."concat-stream-1.6.2"
- sources."configstore-5.0.1"
- sources."content-disposition-0.5.4"
- sources."content-type-1.0.5"
- sources."cookie-0.5.0"
- sources."cookie-signature-1.0.6"
- sources."core-util-is-1.0.3"
- sources."crypto-random-string-2.0.0"
- sources."debug-4.3.4"
- sources."decompress-response-3.3.0"
- sources."deep-extend-0.6.0"
- sources."defer-to-connect-1.1.3"
- sources."define-lazy-prop-2.0.0"
- sources."depd-2.0.0"
- sources."destroy-1.2.0"
- sources."dot-prop-5.3.0"
- sources."duplexer3-0.1.5"
- sources."ee-first-1.1.1"
- sources."emoji-regex-8.0.0"
- sources."encodeurl-1.0.2"
- sources."end-of-stream-1.4.4"
- sources."es6-promise-4.2.8"
- sources."es6-promisify-5.0.0"
- sources."escape-goat-2.1.1"
- sources."escape-html-1.0.3"
- sources."esprima-4.0.1"
- sources."etag-1.8.1"
- (sources."express-4.18.2" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."ms-2.0.0"
- ];
- })
- (sources."extract-zip-1.7.0" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."ms-2.0.0"
- ];
- })
- sources."fd-slicer-1.1.0"
- sources."fill-range-7.0.1"
- (sources."finalhandler-1.2.0" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."ms-2.0.0"
- ];
- })
- sources."forwarded-0.2.0"
- sources."fresh-0.5.2"
- sources."fs-extra-11.1.1"
- sources."fs.realpath-1.0.0"
- sources."fsevents-2.3.2"
- sources."function-bind-1.1.1"
- sources."get-intrinsic-1.2.1"
- sources."get-stream-4.1.0"
- sources."glob-8.1.0"
- sources."glob-parent-5.1.2"
- sources."global-dirs-3.0.1"
- sources."got-9.6.0"
- sources."graceful-fs-4.2.11"
- sources."has-1.0.3"
- sources."has-flag-4.0.0"
- sources."has-proto-1.0.1"
- sources."has-symbols-1.0.3"
- sources."has-yarn-2.1.0"
- sources."highlight.js-11.8.0"
- sources."http-cache-semantics-4.1.1"
- sources."http-errors-2.0.0"
- (sources."https-proxy-agent-2.2.4" // {
- dependencies = [
- sources."debug-3.2.7"
- ];
- })
- sources."iconv-lite-0.4.24"
- sources."import-lazy-2.1.0"
- sources."imurmurhash-0.1.4"
- sources."inflight-1.0.6"
- sources."inherits-2.0.4"
- sources."ini-2.0.0"
- sources."ipaddr.js-1.9.1"
- sources."is-binary-path-2.1.0"
- sources."is-ci-2.0.0"
- sources."is-docker-2.2.1"
- sources."is-extglob-2.1.1"
- sources."is-fullwidth-code-point-3.0.0"
- sources."is-glob-4.0.3"
- sources."is-installed-globally-0.4.0"
- sources."is-npm-5.0.0"
- sources."is-number-7.0.0"
- sources."is-obj-2.0.0"
- sources."is-path-inside-3.0.3"
- sources."is-typedarray-1.0.0"
- sources."is-wsl-2.2.0"
- sources."is-yarn-global-0.3.0"
- sources."isarray-1.0.0"
- sources."js-yaml-3.14.1"
- sources."json-buffer-3.0.0"
- sources."jsonfile-6.1.0"
- sources."keyv-3.1.0"
- sources."latest-version-5.1.0"
- sources."livereload-0.9.3"
- sources."livereload-js-3.4.1"
- sources."lodash-4.17.21"
- sources."lowercase-keys-1.0.1"
- sources."lru-cache-6.0.0"
- (sources."make-dir-3.1.0" // {
- dependencies = [
- sources."semver-6.3.1"
- ];
- })
- sources."media-typer-0.3.0"
- sources."merge-descriptors-1.0.1"
- sources."methods-1.1.2"
- sources."mime-1.6.0"
- sources."mime-db-1.52.0"
- sources."mime-types-2.1.35"
- sources."mimic-response-1.0.1"
- sources."minimatch-5.1.6"
- sources."minimist-1.2.8"
- sources."mkdirp-0.5.6"
- sources."ms-2.1.2"
- sources."mustache-4.2.0"
- sources."negotiator-0.6.3"
- sources."node-gyp-build-4.6.0"
- sources."normalize-path-3.0.0"
- sources."normalize-url-4.5.1"
- sources."object-inspect-1.12.3"
- sources."on-finished-2.4.1"
- sources."once-1.4.0"
- sources."open-8.4.2"
- sources."opts-2.0.2"
- sources."p-cancelable-1.1.0"
- (sources."package-json-6.5.0" // {
- dependencies = [
- sources."semver-6.3.1"
- ];
- })
- sources."parseurl-1.3.3"
- sources."path-is-absolute-1.0.1"
- sources."path-to-regexp-0.1.7"
- sources."pend-1.2.0"
- sources."picomatch-2.3.1"
- sources."prepend-http-2.0.0"
- sources."process-nextick-args-2.0.1"
- sources."progress-2.0.3"
- sources."proxy-addr-2.0.7"
- sources."proxy-from-env-1.1.0"
- sources."pump-3.0.0"
- sources."pupa-2.1.1"
- (sources."puppeteer-1.20.0" // {
- dependencies = [
- sources."mime-2.6.0"
- sources."ws-6.2.2"
- ];
- })
- sources."qs-6.11.0"
- sources."range-parser-1.2.1"
- sources."raw-body-2.5.1"
- (sources."rc-1.2.8" // {
- dependencies = [
- sources."ini-1.3.8"
- ];
- })
- (sources."readable-stream-2.3.8" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
- ];
- })
- sources."readdirp-3.6.0"
- sources."registry-auth-token-4.2.2"
- sources."registry-url-5.1.0"
- sources."responselike-1.0.2"
- sources."reveal.js-4.5.0"
- (sources."rimraf-2.7.1" // {
- dependencies = [
- sources."brace-expansion-1.1.11"
- sources."glob-7.2.3"
- sources."minimatch-3.1.2"
- ];
- })
- sources."safe-buffer-5.2.1"
- sources."safer-buffer-2.1.2"
- sources."semver-7.5.4"
- (sources."semver-diff-3.1.1" // {
- dependencies = [
- sources."semver-6.3.1"
- ];
- })
- (sources."send-0.18.0" // {
- dependencies = [
- (sources."debug-2.6.9" // {
- dependencies = [
- sources."ms-2.0.0"
- ];
- })
- sources."ms-2.1.3"
- ];
- })
- (sources."serve-favicon-2.5.0" // {
- dependencies = [
- sources."ms-2.1.1"
- sources."safe-buffer-5.1.1"
- ];
- })
- sources."serve-static-1.15.0"
- sources."setprototypeof-1.2.0"
- sources."side-channel-1.0.4"
- sources."signal-exit-3.0.7"
- sources."sprintf-js-1.0.3"
- sources."statuses-2.0.1"
- sources."string-width-4.2.3"
- (sources."string_decoder-1.1.1" // {
- dependencies = [
- sources."safe-buffer-5.1.2"
- ];
- })
- sources."strip-ansi-6.0.1"
- sources."strip-json-comments-2.0.1"
- sources."supports-color-7.2.0"
- sources."to-readable-stream-1.0.0"
- sources."to-regex-range-5.0.1"
- sources."toidentifier-1.0.1"
- sources."try-require-1.2.1"
- sources."type-fest-0.20.2"
- sources."type-is-1.6.18"
- sources."typedarray-0.0.6"
- sources."typedarray-to-buffer-3.1.5"
- sources."unique-string-2.0.0"
- sources."universalify-2.0.0"
- sources."unpipe-1.0.0"
- sources."update-notifier-5.1.0"
- sources."url-parse-lax-3.0.0"
- sources."utf-8-validate-5.0.10"
- sources."util-deprecate-1.0.2"
- sources."utils-merge-1.0.1"
- sources."vary-1.1.2"
- sources."widest-line-3.1.0"
- sources."wrap-ansi-7.0.0"
- sources."wrappy-1.0.2"
- sources."write-file-atomic-3.0.3"
- sources."ws-7.5.9"
- sources."xdg-basedir-4.0.0"
- sources."yallist-4.0.0"
- sources."yaml-front-matter-4.1.1"
- sources."yargs-parser-21.1.1"
- sources."yauzl-2.10.0"
- ];
- buildInputs = globalBuildInputs;
- meta = {
- description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files.";
- homepage = "https://github.com/webpro/reveal-md#readme";
- license = "MIT";
- };
- production = true;
- bypassCache = true;
- reconstructLock = true;
- };
rimraf = nodeEnv.buildNodePackage {
name = "rimraf";
packageName = "rimraf";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 863fb6e46674..69e5d65baeea 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -162,10 +162,6 @@ final: prev: {
nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ];
};
- flood = prev.flood.override {
- buildInputs = [ final.node-pre-gyp ];
- };
-
git-ssb = prev.git-ssb.override (oldAttrs: {
buildInputs = [ final.node-gyp-build ];
meta = oldAttrs.meta // { broken = since "10"; };
@@ -420,19 +416,6 @@ final: prev: {
'';
};
- reveal-md = prev.reveal-md.override (
- lib.optionalAttrs (!stdenv.isDarwin) {
- nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
- prePatch = ''
- export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
- '';
- postInstall = ''
- wrapProgram $out/bin/reveal-md \
- --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium
- '';
- }
- );
-
rush = prev."@microsoft/rush".override {
name = "rush";
};
diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix
new file mode 100644
index 000000000000..208a879b1d1c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/trace/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildDunePackage }:
+
+buildDunePackage rec {
+ pname = "trace";
+ version = "0.2";
+
+ minimalOCamlVersion = "4.05";
+
+ src = fetchurl {
+ url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz";
+ hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ=";
+ };
+
+ meta = {
+ description = "Common interface for tracing/instrumentation libraries in OCaml";
+ license = lib.licenses.mit;
+ homepage = "https://c-cube.github.io/trace/";
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/trace/tef.nix b/pkgs/development/ocaml-modules/trace/tef.nix
new file mode 100644
index 000000000000..c1a6f9251554
--- /dev/null
+++ b/pkgs/development/ocaml-modules/trace/tef.nix
@@ -0,0 +1,15 @@
+{ buildDunePackage, trace, mtime }:
+
+buildDunePackage {
+ pname = "trace-tef";
+ inherit (trace) src version;
+
+ propagatedBuildInputs = [ mtime trace ];
+
+ doCheck = true;
+
+ meta = trace.meta // {
+ description = "A simple backend for trace, emitting Catapult JSON into a file";
+ };
+
+}
diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index d3349549bc5c..70b11a9f23f3 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
- version = "0.15.3";
+ version = "0.15.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
- hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto=";
+ hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 0c1aa9fbf2d1..81a8e3678272 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
- version = "0.5.13";
+ version = "0.5.20";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY=";
+ hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
index f71068188049..974cd8f464cb 100644
--- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
@@ -18,5 +18,6 @@ buildGoModule rec {
license = licenses.unfreeRedistributable;
homepage = "https://github.com/drone-runners/drone-runner-docker";
description = "Drone pipeline runner that executes builds inside Docker containers";
+ mainProgram = "drone-runner-docker";
};
}
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
index 373c6183725d..c40d94645d1e 100644
--- a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
@@ -22,5 +22,6 @@ buildGoModule rec {
# https://polyformproject.org/licenses/small-business/1.0.0/
license = licenses.unfree;
maintainers = with maintainers; [ mic92 ];
+ mainProgram = "drone-runner-exec";
};
}
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix
index 1d15cdc60479..92a015f8e95a 100644
--- a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix
@@ -18,5 +18,6 @@ buildGoModule rec {
homepage = "https://github.com/drone-runners/drone-runner-ssh";
license = licenses.unfreeRedistributable;
maintainers = teams.c3d2.members;
+ mainProgram = "drone-runner-ssh";
};
}
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
index efe6d5facb39..d1f1da881681 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix
@@ -12,5 +12,6 @@ buildGoModule {
meta = common.meta // {
description = "Command line client for the Woodpecker Continuous Integration server";
+ mainProgram = "woodpecker-cli";
};
}
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 9c3d3c09ea5f..3c6d85e8ddcc 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -76,5 +76,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin globin artturin ];
platforms = platforms.unix;
downloadPage = "https://stedolan.github.io/jq/download/";
+ mainProgram = "jq";
};
}
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 61df38f68ce9..4e776b34ded3 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }:
stdenv.mkDerivation rec {
pname = "autogen";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildPackages.buildPackages.autogen buildPackages.texinfo
];
buildInputs = [
- guile libxml2
+ guile_2_2 libxml2
];
preConfigure = ''
diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix
index a95a0c1b7f16..b3ba24db42c8 100644
--- a/pkgs/development/tools/prettierd/default.nix
+++ b/pkgs/development/tools/prettierd/default.nix
@@ -41,6 +41,7 @@ mkYarnPackage rec {
doDist = false;
meta = with lib; {
+ mainProgram = "prettierd";
description = "Prettier, as a daemon, for improved formatting speed";
homepage = "https://github.com/fsouza/prettierd";
license = licenses.isc;
diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix
index f51e63d757e2..0b2f219014a0 100644
--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "viceroy";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "fastly";
repo = pname;
rev = "v${version}";
- hash = "sha256-lFDhiBgJFCXE7/BzCuNFPmP8PYHCqu6jYqRNa+M4J8Q=";
+ hash = "sha256-+vvlj8gGCHKQ2T245fwaZxCiglRnrDFwupQIh3I47Ys=";
};
buildInputs = lib.optional stdenv.isDarwin Security;
- cargoHash = "sha256-HJXCNjWjO1GWIP46kqvq8mZVlYVvlG9ahxScpG3rfTA=";
+ cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws=";
cargoTestFlags = [
"--package viceroy-lib"
diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 4a6f8d0c8ef2..960798cde222 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ckan";
- version = "1.32.0";
+ version = "1.33.2";
src = fetchurl {
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
- sha256 = "sha256-cD8S5UcS5tBJoW1IExrmtoYn8k/P7RjCRAx7BEhAWGk=";
+ sha256 = "sha256-FIndxRyGDgXinP8ZX0o6LEJgGNNw84tCPw5FdVAU3TI=";
};
dontUnpack = true;
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 13d63117b7f8..2687ee7febdd 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -49,5 +49,6 @@ in stdenv.mkDerivation {
homepage = "https://store.steampowered.com/";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ jagajaga jonringer ];
+ mainProgram = "steam";
};
}
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 2fab8b4bd676..43a37ad764ee 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ megheaiulian ];
platforms = platforms.linux;
+ mainProgram = "brightnessctl";
};
}
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index ef861068fa49..b9f59934efea 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
+{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, freefont_ttf, makeFontsConf
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ];
buildInputs =
- [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
+ [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm
python3 gettext perl fontconfig freetype pango
fontforge help2man groff t1utils boehmgc rsync
];
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index 8928234f9672..3b3dd52be6ef 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -31,5 +31,6 @@ buildGoModule rec {
homepage = "https://github.com/Luzifer/nginx-sso";
license = licenses.asl20;
maintainers = with maintainers; [ delroth ];
+ mainProgram = "nginx-sso";
};
}
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 17e0ca66e3f3..ed9e5ba43c99 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
+{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }:
stdenv.mkDerivation rec {
pname = "xbindkeys";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libX11 guile ];
+ buildInputs = [ libX11 guile_2_2 ];
meta = {
homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix
index 9f7b4350f1b1..87c0fc6ae2a7 100644
--- a/pkgs/tools/networking/junkie/default.nix
+++ b/pkgs/tools/networking/junkie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }:
stdenv.mkDerivation rec {
pname = "junkie";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
'';
- buildInputs = [ libpcap guile openssl ];
+ buildInputs = [ libpcap guile_2_2 openssl ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
"GUILELIBDIR=\${out}/share/guile/site"
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 9ee9a3df0f75..2c5b064a165f 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
kea = nixosTests.kea;
prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation;
prometheus-exporter = nixosTests.prometheus-exporters.kea;
+ networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; };
+ networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; };
};
meta = with lib; {
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 6ed8b2fc4b5b..2fa7f78f4937 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -12,7 +12,7 @@
, gdbm
, gnutls
, gss
-, guile
+, guile_2_2
, libmysqlclient
, mailcap
, nettools
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
libxcrypt
] ++ lib.optionals stdenv.isLinux [ nettools ]
++ lib.optionals pythonSupport [ python3 ]
- ++ lib.optionals guileSupport [ guile ];
+ ++ lib.optionals guileSupport [ guile_2_2 ];
patches = [
./fix-build-mb-len-max.patch
diff --git a/pkgs/tools/networking/pgrok/default.nix b/pkgs/tools/networking/pgrok/default.nix
index 8fafcccd0707..6074746e9749 100644
--- a/pkgs/tools/networking/pgrok/default.nix
+++ b/pkgs/tools/networking/pgrok/default.nix
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "pgrok";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "pgrok";
repo = "pgrok";
rev = "v${version}";
- hash = "sha256-0b7d3wyhRuTxZmpx9oJnZN88yYn+TsR82KrktPAx9P4=";
+ hash = "sha256-lhcaJVIqZK7GnC/Q/+RDxTVFmgTana3vugDHr/SStFE=";
};
- vendorHash = "sha256-laSfyHFkJJkv4EPMIVcai7RXaGIpUp+0tOpt5vhcLkA=";
+ vendorHash = "sha256-UzNx361cg4IDSQGlX5N9AxYZ8cYA0zsF5JF4Fe7efqM=";
outputs = [ "out" "server" ];
diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index ea8e304099c0..44b67e96a1e0 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/str4d/rage/raw/v${version}/rage/CHANGELOG.md";
license = with licenses; [ asl20 mit ]; # either at your option
maintainers = with maintainers; [ marsam ryantm ];
+ mainProgram = "rage";
};
}
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 8fe044a9e218..d85880e82e15 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.unix ++ platforms.windows;
maintainers = [ ];
+ mainProgram = "gawk";
};
}
diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/tools/text/reveal-md/default.nix
new file mode 100644
index 000000000000..0ae05e59025d
--- /dev/null
+++ b/pkgs/tools/text/reveal-md/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+ pname = "reveal-md";
+ version = "5.5.1";
+
+ src = fetchFromGitHub {
+ owner = "webpro";
+ repo = "reveal-md";
+ rev = version;
+ hash = "sha256-BlUZsETMdOmnz+OFGQhQ9aLHxIIAZ12X1ipy3u59zxo=";
+ };
+
+ npmDepsHash = "sha256-xaDBB16egGi8zThHRrhcN8TVf6Nqkx8fkbxWqvJwJb4=";
+
+ env = {
+ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;
+ };
+
+ dontNpmBuild = true;
+
+ doCheck = true;
+
+ checkPhase = ''
+ runHook preCheck
+
+ npm run test
+
+ runHook postCheck
+ '';
+
+ meta = {
+ description = "Get beautiful reveal.js presentations from your Markdown files";
+ homepage = "https://github.com/webpro/reveal-md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ sagikazarmark ];
+ };
+}
diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix
index 24b579c49a33..264eeea52e38 100644
--- a/pkgs/tools/typesetting/skribilo/default.nix
+++ b/pkgs/tools/typesetting/skribilo/default.nix
@@ -10,9 +10,9 @@
, imagemagick
, makeWrapper
, pkg-config
-, ploticus
, enableEmacs ? false, emacs
-, enableLout ? true, lout
+, enableLout ? stdenv.isLinux, lout
+, enablePloticus ? stdenv.isLinux, ploticus
, enableTex ? true, tex
}:
@@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: {
guile-lib
guile-reader
imagemagick
- ploticus
]
++ optional enableEmacs emacs
++ optional enableLout lout
+ ++ optional enablePloticus ploticus
++ optional enableTex tex;
postInstall =
diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix
index 3d74344a4e76..c5146532e442 100644
--- a/pkgs/tools/wayland/gtklock/default.nix
+++ b/pkgs/tools/wayland/gtklock/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ dit7ya ];
platforms = platforms.linux;
+ mainProgram = "gtklock";
};
}
diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix
index 3555af7c0424..d97c8ea28df8 100644
--- a/pkgs/tools/wayland/swww/default.nix
+++ b/pkgs/tools/wayland/swww/default.nix
@@ -1,4 +1,13 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, lz4
+, libxkbcommon
+, installShellFiles
+, scdoc
+}:
+
rustPlatform.buildRustPackage rec {
pname = "swww";
version = "0.8.1";
@@ -11,15 +20,39 @@ rustPlatform.buildRustPackage rec {
};
cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE=";
- buildInputs = [ lz4 libxkbcommon ];
+
+ buildInputs = [
+ lz4
+ libxkbcommon
+ ];
+
doCheck = false; # Integration tests do not work in sandbox environment
- nativeBuildInputs = [ pkg-config ];
+
+ nativeBuildInputs = [
+ pkg-config
+ installShellFiles
+ scdoc
+ ];
+
+ postInstall = ''
+ for f in doc/*.scd; do
+ local page="doc/$(basename "$f" .scd)"
+ scdoc < "$f" > "$page"
+ installManPage "$page"
+ done
+
+ installShellCompletion --cmd swww \
+ --bash <(cat completions/swww.bash) \
+ --fish <(cat completions/swww.fish) \
+ --zsh <(cat completions/_swww)
+ '';
meta = with lib; {
description = "Efficient animated wallpaper daemon for wayland, controlled at runtime";
homepage = "https://github.com/Horus645/swww";
license = licenses.gpl3;
- maintainers = with maintainers; [ mateodd25 ];
+ maintainers = with maintainers; [ mateodd25 donovanglover ];
platforms = platforms.linux;
+ mainProgram = "swww";
};
}
diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix
index de150c3af309..2be33bee6ac0 100644
--- a/pkgs/tools/wayland/wlogout/default.nix
+++ b/pkgs/tools/wayland/wlogout/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
+ mainProgram = "wlogout";
};
}
# TODO: shell completions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b832872ece1..4aeee3b2181d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3652,7 +3652,7 @@ with pkgs;
readline = readline63;
};
- flood = nodePackages.flood;
+ flood = callPackage ../applications/networking/p2p/flood { };
font-config-info = callPackage ../tools/misc/font-config-info { };
@@ -12427,7 +12427,7 @@ with pkgs;
reuse = callPackage ../tools/package-management/reuse { };
- inherit (nodePackages) reveal-md;
+ reveal-md = callPackage ../tools/text/reveal-md { };
rewritefs = callPackage ../os-specific/linux/rewritefs { };
@@ -12912,6 +12912,8 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight;
};
+ sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { };
+
skippy-xd = callPackage ../tools/X11/skippy-xd { };
sks = callPackage ../servers/sks {
@@ -18034,7 +18036,7 @@ with pkgs;
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
- guile = guile_2_2;
+ guile = guile_3_0;
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
@@ -18060,7 +18062,9 @@ with pkgs;
guile-reader = callPackage ../development/guile-modules/guile-reader { };
- guile-sdl = callPackage ../development/guile-modules/guile-sdl { };
+ guile-sdl = callPackage ../development/guile-modules/guile-sdl {
+ guile = guile_2_2;
+ };
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 02e659de3a99..de2acdd372da 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1643,6 +1643,10 @@ let
inherit (pkgs.python3Packages) torch;
};
+ trace = callPackage ../development/ocaml-modules/trace { };
+
+ trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { };
+
trie = callPackage ../development/ocaml-modules/trie { };
tsdl = callPackage ../development/ocaml-modules/tsdl {