diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 72d54f8f43e6..64f1e089a41c 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -57,7 +57,7 @@ In addition to numerous new and upgraded packages, this release has the followin
`mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a
common practice for a long time in other distributions.
-- PHP 8.2.0 RC 6 is available.
+- PHP 8.2.0 RC 7 is available.
- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it.
@@ -484,12 +484,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- Add udev rules for the Teensy family of microcontrollers.
-- The Qt QML disk cache is now disabled by default. This fixes a
- long-standing issue where updating Qt/KDE apps would sometimes cause
- them to crash or behave strangely without explanation. Those concerned
- about the small (~10%) performance hit to application startup can
- re-enable the cache (and expose themselves to gremlins) by setting the
- envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the
+- The Qt QML disk cache is now disabled by default. This fixes a
+ long-standing issue where updating Qt/KDE apps would sometimes cause
+ them to crash or behave strangely without explanation. Those concerned
+ about the small (~10%) performance hit to application startup can
+ re-enable the cache (and expose themselves to gremlins) by setting the
+ envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the
`environment.sessionVariables` NixOS option.
- systemd-oomd is enabled by default. Depending on which systemd units have
diff --git a/nixos/modules/services/misc/pinnwand.nix b/nixos/modules/services/misc/pinnwand.nix
index 294769861111..5fca9f4125a8 100644
--- a/nixos/modules/services/misc/pinnwand.nix
+++ b/nixos/modules/services/misc/pinnwand.nix
@@ -19,29 +19,66 @@ in
};
settings = mkOption {
- type = format.type;
+ default = {};
description = lib.mdDoc ''
Your {file}`pinnwand.toml` as a Nix attribute set. Look up
- possible options in the [pinnwand.toml-example](https://github.com/supakeen/pinnwand/blob/master/pinnwand.toml-example).
+ possible options in the [documentation](https://pinnwand.readthedocs.io/en/v${pkgs.pinnwand.version}/configuration.html).
'';
- default = {};
+ type = types.submodule {
+ freeformType = format.type;
+ options = {
+ database_uri = mkOption {
+ type = types.str;
+ default = "sqlite:////var/lib/pinnwand/pinnwand.db";
+ example = "sqlite:///:memory";
+ description = lib.mdDoc ''
+ Database URI compatible with [SQLAlchemyhttps://docs.sqlalchemy.org/en/14/core/engines.html#database-urls].
+
+ Additional packages may need to be introduced into the environment for certain databases.
+ '';
+ };
+
+ paste_size = mkOption {
+ type = types.ints.positive;
+ default = 262144;
+ example = 524288;
+ description = lib.mdDoc ''
+ Maximum size of a paste in bytes.
+ '';
+ };
+ paste_help = mkOption {
+ type = types.str;
+ default = ''
+ Welcome to pinnwand, this site is a pastebin. It allows you to share code with others. If you write code in the text area below and press the paste button you will be given a link you can share with others so they can view your code as well.
People with the link can view your pasted code, only you can remove your paste and it expires automatically. Note that anyone could guess the URI to your paste so don't rely on it being private.
+ '';
+ description = lib.mdDoc ''
+ Raw HTML help text shown in the header area.
+ '';
+ };
+ footer = mkOption {
+ type = types.str;
+ default = ''
+ View source code, the removal or expiry stories, or read the about page.
+ '';
+ description = lib.mdDoc ''
+ The footer in raw HTML.
+ '';
+ };
+ };
+ };
};
};
config = mkIf cfg.enable {
- services.pinnwand.settings = {
- database_uri = mkDefault "sqlite:////var/lib/pinnwand/pinnwand.db";
- paste_size = mkDefault 262144;
- paste_help = mkDefault ''
- Welcome to pinnwand, this site is a pastebin. It allows you to share code with others. If you write code in the text area below and press the paste button you will be given a link you can share with others so they can view your code as well.
People with the link can view your pasted code, only you can remove your paste and it expires automatically. Note that anyone could guess the URI to your paste so don't rely on it being private.
- '';
- footer = mkDefault ''
- View source code, the removal or expiry stories, or read the about page.
- '';
- };
+ systemd.services.pinnwand = {
+ description = "Pinnwannd HTTP Server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
- systemd.services = let
- hardeningOptions = {
+ unitConfig.Documentation = "https://pinnwand.readthedocs.io/en/latest/";
+
+ serviceConfig = {
+ ExecStart = "${pkgs.pinnwand}/bin/pinnwand --configuration-path ${configFile} http --port ${toString cfg.port}";
User = "pinnwand";
DynamicUser = true;
@@ -72,32 +109,14 @@ in
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
- SystemCallFilter = "@system-service";
+ SystemCallFilter = [
+ "@system-service"
+ "~@privileged"
+ ];
UMask = "0077";
};
-
- command = "${pkgs.pinnwand}/bin/pinnwand --configuration-path ${configFile}";
- in {
- pinnwand = {
- description = "Pinnwannd HTTP Server";
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- unitConfig.Documentation = "https://pinnwand.readthedocs.io/en/latest/";
-
- serviceConfig = {
- ExecStart = "${command} http --port ${toString(cfg.port)}";
- } // hardeningOptions;
- };
-
- pinnwand-reaper = {
- description = "Pinnwand Reaper";
- startAt = "daily";
-
- serviceConfig = {
- ExecStart = "${command} -vvvv reap"; # verbosity increased to show number of deleted pastes
- } // hardeningOptions;
- };
};
};
+
+ meta.buildDocsInSandbox = false;
}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 12afc23592ba..85c76ed59d66 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -192,6 +192,14 @@ let
server_tokens ${if cfg.serverTokens then "on" else "off"};
+ ${optionalString (cfg.proxyCache.enable) ''
+ proxy_cache_path /var/cache/nginx keys_zone=${cfg.proxyCache.keysZoneName}:${cfg.proxyCache.keysZoneSize}
+ levels=${cfg.proxyCache.levels}
+ use_temp_path=${if cfg.proxyCache.useTempPath then "on" else "off"}
+ inactive=${cfg.proxyCache.inactive}
+ max_size=${cfg.proxyCache.maxSize};
+ ''}
+
${cfg.commonHttpConfig}
${vhosts}
@@ -707,6 +715,72 @@ in
'';
};
+ proxyCache = mkOption {
+ type = types.submodule {
+ options = {
+ enable = mkEnableOption (lib.mdDoc "Enable proxy cache");
+
+ keysZoneName = mkOption {
+ type = types.str;
+ default = "cache";
+ example = "my_cache";
+ description = lib.mdDoc "Set name to shared memory zone.";
+ };
+
+ keysZoneSize = mkOption {
+ type = types.str;
+ default = "10m";
+ example = "32m";
+ description = lib.mdDoc "Set size to shared memory zone.";
+ };
+
+ levels = mkOption {
+ type = types.str;
+ default = "1:2";
+ example = "1:2:2";
+ description = lib.mdDoc ''
+ The levels parameter defines structure of subdirectories in cache: from
+ 1 to 3, each level accepts values 1 or 2. Сan be used any combination of
+ 1 and 2 in these formats: x, x:x and x:x:x.
+ '';
+ };
+
+ useTempPath = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = lib.mdDoc ''
+ Nginx first writes files that are destined for the cache to a temporary
+ storage area, and the use_temp_path=off directive instructs Nginx to
+ write them to the same directories where they will be cached. Recommended
+ that you set this parameter to off to avoid unnecessary copying of data
+ between file systems.
+ '';
+ };
+
+ inactive = mkOption {
+ type = types.str;
+ default = "10m";
+ example = "1d";
+ description = lib.mdDoc ''
+ Cached data that has not been accessed for the time specified by
+ the inactive parameter is removed from the cache, regardless of
+ its freshness.
+ '';
+ };
+
+ maxSize = mkOption {
+ type = types.str;
+ default = "1g";
+ example = "2048m";
+ description = lib.mdDoc "Set maximum cache size";
+ };
+ };
+ };
+ default = {};
+ description = lib.mdDoc "Configure proxy cache";
+ };
+
resolver = mkOption {
type = types.submodule {
options = {
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 7ab8f8dc676c..a093baea6a65 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -33,7 +33,7 @@ let
mountPoint = mkOption {
example = "/mnt/usb";
type = nonEmptyWithoutTrailingSlash;
- description = lib.mdDoc "Location of the mounted the file system.";
+ description = lib.mdDoc "Location of the mounted file system.";
};
device = mkOption {
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index bb3d50d9a78c..726884d7cd9c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -586,6 +586,7 @@ in {
sourcehut = handleTest ./sourcehut.nix {};
spacecookie = handleTest ./spacecookie.nix {};
spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
+ sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {};
sslh = handleTest ./sslh.nix {};
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
diff --git a/nixos/tests/pinnwand.nix b/nixos/tests/pinnwand.nix
index 0391c4133111..42b26e08c189 100644
--- a/nixos/tests/pinnwand.nix
+++ b/nixos/tests/pinnwand.nix
@@ -1,27 +1,7 @@
import ./make-test-python.nix ({ pkgs, ...}:
let
- pythonEnv = pkgs.python3.withPackages (py: with py; [ appdirs toml ]);
-
port = 8000;
baseUrl = "http://server:${toString port}";
-
- configureSteck = pkgs.writeScript "configure.py" ''
- #!${pythonEnv.interpreter}
- import appdirs
- import toml
- import os
-
- CONFIG = {
- "base": "${baseUrl}/",
- "confirm": False,
- "magic": True,
- "ignore": True
- }
-
- os.makedirs(appdirs.user_config_dir('steck'))
- with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
- toml.dump(CONFIG, fd)
- '';
in
{
name = "pinnwand";
@@ -44,7 +24,32 @@ in
client = { pkgs, ... }:
{
- environment.systemPackages = [ pkgs.steck ];
+ environment.systemPackages = [
+ pkgs.steck
+
+ (pkgs.writers.writePython3Bin "setup-steck.py" {
+ libraries = with pkgs.python3.pkgs; [ appdirs toml ];
+ flakeIgnore = [
+ "E501"
+ ];
+ }
+ ''
+ import appdirs
+ import toml
+ import os
+
+ CONFIG = {
+ "base": "${baseUrl}/",
+ "confirm": False,
+ "magic": True,
+ "ignore": True
+ }
+
+ os.makedirs(appdirs.user_config_dir('steck'))
+ with open(os.path.join(appdirs.user_config_dir('steck'), 'steck.toml'), "w") as fd:
+ toml.dump(CONFIG, fd)
+ '')
+ ];
};
};
@@ -55,7 +60,7 @@ in
client.wait_for_unit("network.target")
# create steck.toml config file
- client.succeed("${configureSteck}")
+ client.succeed("setup-steck.py")
# wait until the server running pinnwand is reachable
client.wait_until_succeeds("ping -c1 server")
@@ -75,12 +80,6 @@ in
if line.startswith("Removal link:"):
removal_link = line.split(":", 1)[1]
-
- # start the reaper, it shouldn't do anything meaningful here
- server.systemctl("start pinnwand-reaper.service")
- server.wait_until_fails("systemctl is-active -q pinnwand-reaper.service")
- server.log(server.execute("journalctl -u pinnwand-reaper -e --no-pager")[1])
-
# check whether paste matches what we sent
client.succeed(f"curl {raw_url} > /tmp/machine-id")
client.succeed("diff /tmp/machine-id /etc/machine-id")
@@ -89,6 +88,6 @@ in
client.succeed(f"curl {removal_link}")
client.fail(f"curl --fail {raw_url}")
- server.log(server.succeed("systemd-analyze security pinnwand"))
+ server.log(server.execute("systemd-analyze security pinnwand | grep '✗'")[1])
'';
})
diff --git a/nixos/tests/sqlite3-to-mysql.nix b/nixos/tests/sqlite3-to-mysql.nix
new file mode 100644
index 000000000000..029058187df3
--- /dev/null
+++ b/nixos/tests/sqlite3-to-mysql.nix
@@ -0,0 +1,65 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+
+/*
+ This test suite replaces the typical pytestCheckHook function in
+ sqlite3-to-mysql due to the need of a running mysql instance.
+*/
+
+{
+ name = "sqlite3-to-mysql";
+ meta.maintainers = with lib.maintainers; [ gador ];
+
+ nodes.machine = { pkgs, ... }: {
+ environment.systemPackages = with pkgs; [
+ sqlite3-to-mysql
+ # create one coherent python environment
+ (python3.withPackages
+ (ps: sqlite3-to-mysql.propagatedBuildInputs ++
+ [
+ python3Packages.pytest
+ python3Packages.pytest-mock
+ python3Packages.pytest-timeout
+ python3Packages.factory_boy
+ python3Packages.docker # only needed so import does not fail
+ sqlite3-to-mysql
+ ])
+ )
+ ];
+ services.mysql = {
+ package = pkgs.mariadb;
+ enable = true;
+ # from https://github.com/techouse/sqlite3-to-mysql/blob/master/tests/conftest.py
+ # and https://github.com/techouse/sqlite3-to-mysql/blob/master/.github/workflows/test.yml
+ initialScript = pkgs.writeText "mysql-init.sql" ''
+ create database test_db DEFAULT CHARACTER SET utf8mb4;
+ create user tester identified by 'testpass';
+ grant all on test_db.* to tester;
+ create user tester@localhost identified by 'testpass';
+ grant all on test_db.* to tester@localhost;
+ '';
+ settings = {
+ mysqld = {
+ character-set-server = "utf8mb4";
+ collation-server = "utf8mb4_unicode_ci";
+ log_warnings = 1;
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("mysql")
+
+ machine.succeed(
+ "sqlite3mysql --version | grep ${pkgs.sqlite3-to-mysql.version}"
+ )
+
+ # invalid_database_name: assert '1045 (28000): Access denied' in "1044 (42000): Access denied [...]
+ # invalid_database_user: does not return non-zero exit for some reason
+ # test_version: has problems importing sqlite3_to_mysql and determining the version
+ machine.succeed(
+ "cd ${pkgs.sqlite3-to-mysql.src} \
+ && pytest -v --no-docker -k \"not test_invalid_database_name and not test_invalid_database_user and not test_version\""
+ )
+ '';
+})
diff --git a/nixos/tests/stratis/encryption.nix b/nixos/tests/stratis/encryption.nix
index 3faa3171843f..a555ff8a8e85 100644
--- a/nixos/tests/stratis/encryption.nix
+++ b/nixos/tests/stratis/encryption.nix
@@ -26,8 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
# test rebinding encrypted pool
machine.succeed("stratis pool rebind keyring testpool testkey2")
# test restarting encrypted pool
- uuid = machine.succeed("stratis pool list | grep -oE '[0-9a-fA-F-]{36}'").rstrip('\n')
- machine.succeed(" stratis pool stop testpool")
- machine.succeed(f"stratis pool start {uuid} --unlock-method keyring")
+ machine.succeed("stratis pool stop testpool")
+ machine.succeed("stratis pool start --name testpool --unlock-method keyring")
'';
})
diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix
index ecf94e33ff17..9309f6a14dd7 100644
--- a/nixos/tests/vector.nix
+++ b/nixos/tests/vector.nix
@@ -21,7 +21,7 @@ with pkgs.lib;
type = "file";
inputs = [ "journald" ];
path = "/var/lib/vector/logs.log";
- encoding = { codec = "ndjson"; };
+ encoding = { codec = "json"; };
};
};
};
diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix
new file mode 100644
index 000000000000..358dfce0d4f0
--- /dev/null
+++ b/pkgs/applications/audio/aaxtomp3/default.nix
@@ -0,0 +1,56 @@
+{ coreutils
+, fetchFromGitHub
+, ffmpeg
+, findutils
+, gnugrep
+, gnused
+, jq
+, lame
+, lib
+, makeWrapper
+, mediainfo
+, mp4v2
+, stdenv
+}:
+let
+ runtimeInputs = [
+ coreutils
+ ffmpeg
+ findutils
+ gnugrep
+ gnused
+ jq
+ lame
+ mediainfo
+ mp4v2
+ ];
+in
+stdenv.mkDerivation rec {
+ pname = "aaxtomp3";
+ version = "1.3";
+
+ src = fetchFromGitHub {
+ owner = "krumpetpirate";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg=";
+ };
+
+ dontBuild = false;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ install -Dm755 AAXtoMP3 $out/bin/aaxtomp3
+ wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
+ install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3
+ wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs}
+ '';
+
+ meta = with lib; {
+ description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS";
+ homepage = "https://krumpetpirate.github.io/AAXtoMP3";
+ license = licenses.wtfpl;
+ maintainers = with maintainers; [ urandom ];
+ };
+}
diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch
index f47c233d6aee..45754a1f9e5d 100644
--- a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch
+++ b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch
@@ -1,16 +1,18 @@
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 0000000..f191345
+index 0000000..471b1a5
--- /dev/null
+++ b/Cargo.lock
-@@ -0,0 +1,2649 @@
+@@ -0,0 +1,2778 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
++version = 3
++
+[[package]]
+name = "addr2line"
-+version = "0.14.1"
++version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+dependencies = [
+ "gimli",
+]
@@ -23,18 +25,18 @@ index 0000000..f191345
+
+[[package]]
+name = "aho-corasick"
-+version = "0.7.15"
++version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alsa"
-+version = "0.5.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
++checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
+dependencies = [
+ "alsa-sys",
+ "bitflags",
@@ -53,43 +55,41 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "arrayref"
-+version = "0.3.6"
++name = "android_system_properties"
++version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-+
-+[[package]]
-+name = "arrayvec"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
++dependencies = [
++ "libc",
++]
+
+[[package]]
+name = "async-compression"
-+version = "0.3.7"
++version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537"
++checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
+dependencies = [
+ "bytes 0.5.6",
+ "flate2",
+ "futures-core",
+ "memchr",
-+ "pin-project-lite 0.2.6",
++ "pin-project-lite 0.2.9",
+]
+
+[[package]]
+name = "autocfg"
-+version = "1.0.1"
++version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
-+version = "0.3.56"
++version = "0.3.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
++checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+dependencies = [
+ "addr2line",
++ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "miniz_oxide",
@@ -99,9 +99,9 @@ index 0000000..f191345
+
+[[package]]
+name = "base-x"
-+version = "0.2.8"
++version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
++checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+
+[[package]]
+name = "base64"
@@ -111,15 +111,15 @@ index 0000000..f191345
+
+[[package]]
+name = "base64"
-+version = "0.13.0"
++version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bindgen"
-+version = "0.56.0"
++version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
++checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
+dependencies = [
+ "bitflags",
+ "cexpr",
@@ -132,30 +132,20 @@ index 0000000..f191345
+ "regex",
+ "rustc-hash",
+ "shlex",
++ "syn",
+]
+
+[[package]]
+name = "bitflags"
-+version = "1.2.1"
++version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+
-+[[package]]
-+name = "blake2b_simd"
-+version = "0.5.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-+dependencies = [
-+ "arrayref",
-+ "arrayvec",
-+ "constant_time_eq",
-+]
++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
-+version = "3.6.1"
++version = "3.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
++checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+
+[[package]]
+name = "byteorder"
@@ -181,9 +171,9 @@ index 0000000..f191345
+
+[[package]]
+name = "bytes"
-+version = "1.0.1"
++version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+
+[[package]]
+name = "cassowary"
@@ -193,9 +183,9 @@ index 0000000..f191345
+
+[[package]]
+name = "cc"
-+version = "1.0.67"
++version = "1.0.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
++checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
+dependencies = [
+ "jobserver",
+]
@@ -208,11 +198,11 @@ index 0000000..f191345
+
+[[package]]
+name = "cexpr"
-+version = "0.4.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
++checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
-+ "nom 5.1.2",
++ "nom 7.1.1",
+]
+
+[[package]]
@@ -229,22 +219,24 @@ index 0000000..f191345
+
+[[package]]
+name = "chrono"
-+version = "0.4.19"
++version = "0.4.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
++checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+dependencies = [
-+ "libc",
++ "iana-time-zone",
++ "js-sys",
+ "num-integer",
-+ "num-traits 0.2.14",
-+ "time 0.1.43",
++ "num-traits 0.2.15",
++ "time 0.1.44",
++ "wasm-bindgen",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "clang-sys"
-+version = "1.1.1"
++version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1"
++checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+dependencies = [
+ "glob",
+ "libc",
@@ -258,12 +250,22 @@ index 0000000..f191345
+checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
+
+[[package]]
-+name = "combine"
-+version = "4.5.2"
++name = "codespan-reporting"
++version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
++checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
-+ "bytes 1.0.1",
++ "termcolor",
++ "unicode-width",
++]
++
++[[package]]
++name = "combine"
++version = "4.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
++dependencies = [
++ "bytes 1.2.1",
+ "memchr",
+]
+
@@ -276,7 +278,7 @@ index 0000000..f191345
+ "lazy_static 1.4.0",
+ "nom 4.2.3",
+ "rust-ini",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde-hjson",
+ "serde_json",
+ "toml 0.4.10",
@@ -285,15 +287,9 @@ index 0000000..f191345
+
+[[package]]
+name = "const_fn"
-+version = "0.4.6"
++version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28"
-+
-+[[package]]
-+name = "constant_time_eq"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
++checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+
+[[package]]
+name = "cookie"
@@ -302,8 +298,8 @@ index 0000000..f191345
+checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
+dependencies = [
+ "percent-encoding",
-+ "time 0.2.26",
-+ "version_check 0.9.3",
++ "time 0.2.27",
++ "version_check 0.9.4",
+]
+
+[[package]]
@@ -313,36 +309,30 @@ index 0000000..f191345
+checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3"
+dependencies = [
+ "cookie",
-+ "idna",
++ "idna 0.2.3",
+ "log",
+ "publicsuffix",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde_json",
-+ "time 0.2.26",
++ "time 0.2.27",
+ "url",
+]
+
+[[package]]
+name = "core-foundation"
-+version = "0.9.1"
++version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
-+ "core-foundation-sys 0.8.2",
++ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
-+version = "0.6.2"
++version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-+
-+[[package]]
-+name = "core-foundation-sys"
-+version = "0.8.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
+[[package]]
+name = "coreaudio-rs"
@@ -356,21 +346,21 @@ index 0000000..f191345
+
+[[package]]
+name = "coreaudio-sys"
-+version = "0.2.8"
++version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
++checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb"
+dependencies = [
+ "bindgen",
+]
+
+[[package]]
+name = "cpal"
-+version = "0.13.3"
++version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25"
++checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
+dependencies = [
+ "alsa",
-+ "core-foundation-sys 0.6.2",
++ "core-foundation-sys",
+ "coreaudio-rs",
+ "jni",
+ "js-sys",
@@ -390,29 +380,62 @@ index 0000000..f191345
+
+[[package]]
+name = "crc32fast"
-+version = "1.2.1"
++version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
-+name = "crossbeam-utils"
-+version = "0.8.3"
++name = "cxx"
++version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
++checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+dependencies = [
-+ "autocfg",
-+ "cfg-if 1.0.0",
-+ "lazy_static 1.4.0",
++ "cc",
++ "cxxbridge-flags",
++ "cxxbridge-macro",
++ "link-cplusplus",
++]
++
++[[package]]
++name = "cxx-build"
++version = "1.0.82"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
++dependencies = [
++ "cc",
++ "codespan-reporting",
++ "once_cell",
++ "proc-macro2",
++ "quote",
++ "scratch",
++ "syn",
++]
++
++[[package]]
++name = "cxxbridge-flags"
++version = "1.0.82"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
++
++[[package]]
++name = "cxxbridge-macro"
++version = "1.0.82"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
+]
+
+[[package]]
+name = "darling"
-+version = "0.10.2"
++version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
++checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+dependencies = [
+ "darling_core",
+ "darling_macro",
@@ -420,9 +443,9 @@ index 0000000..f191345
+
+[[package]]
+name = "darling_core"
-+version = "0.10.2"
++version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
++checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+dependencies = [
+ "fnv",
+ "ident_case",
@@ -434,9 +457,9 @@ index 0000000..f191345
+
+[[package]]
+name = "darling_macro"
-+version = "0.10.2"
++version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
++checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+dependencies = [
+ "darling_core",
+ "quote",
@@ -454,17 +477,6 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "derivative"
-+version = "2.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+]
-+
-+[[package]]
+name = "dirs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -476,9 +488,9 @@ index 0000000..f191345
+
+[[package]]
+name = "dirs-sys"
-+version = "0.3.5"
++version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
++checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
@@ -499,15 +511,15 @@ index 0000000..f191345
+
+[[package]]
+name = "either"
-+version = "1.6.1"
++version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+
+[[package]]
+name = "encoding_rs"
-+version = "0.8.28"
++version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+dependencies = [
+ "cfg-if 1.0.0",
+]
@@ -535,14 +547,21 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "flate2"
-+version = "1.0.20"
++name = "fastrand"
++version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
++dependencies = [
++ "instant",
++]
++
++[[package]]
++name = "flate2"
++version = "1.0.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+dependencies = [
-+ "cfg-if 1.0.0",
+ "crc32fast",
-+ "libc",
+ "miniz_oxide",
+]
+
@@ -569,11 +588,10 @@ index 0000000..f191345
+
+[[package]]
+name = "form_urlencoded"
-+version = "1.0.1"
++version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
-+ "matches",
+ "percent-encoding",
+]
+
@@ -595,9 +613,9 @@ index 0000000..f191345
+
+[[package]]
+name = "futures"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
++checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
@@ -610,9 +628,9 @@ index 0000000..f191345
+
+[[package]]
+name = "futures-channel"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
++checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+dependencies = [
+ "futures-core",
+ "futures-sink",
@@ -620,15 +638,15 @@ index 0000000..f191345
+
+[[package]]
+name = "futures-core"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
++checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+
+[[package]]
+name = "futures-executor"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
++checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+dependencies = [
+ "futures-core",
+ "futures-task",
@@ -637,17 +655,16 @@ index 0000000..f191345
+
+[[package]]
+name = "futures-io"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
++checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+
+[[package]]
+name = "futures-macro"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
++checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+dependencies = [
-+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
@@ -655,21 +672,21 @@ index 0000000..f191345
+
+[[package]]
+name = "futures-sink"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
++checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+
+[[package]]
+name = "futures-task"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
++checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+
+[[package]]
+name = "futures-util"
-+version = "0.3.13"
++version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
++checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
@@ -678,10 +695,8 @@ index 0000000..f191345
+ "futures-sink",
+ "futures-task",
+ "memchr",
-+ "pin-project-lite 0.2.6",
++ "pin-project-lite 0.2.9",
+ "pin-utils",
-+ "proc-macro-hack",
-+ "proc-macro-nested",
+ "slab",
+]
+
@@ -698,20 +713,20 @@ index 0000000..f191345
+
+[[package]]
+name = "getrandom"
-+version = "0.2.2"
++version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
-+ "wasi 0.10.2+wasi-snapshot-preview1",
++ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
-+version = "0.23.0"
++version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
++checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+
+[[package]]
+name = "glob"
@@ -741,15 +756,15 @@ index 0000000..f191345
+
+[[package]]
+name = "hashbrown"
-+version = "0.9.1"
++version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hermit-abi"
-+version = "0.1.18"
++version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
@@ -762,19 +777,19 @@ index 0000000..f191345
+
+[[package]]
+name = "hound"
-+version = "3.4.0"
++version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
++checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1"
+
+[[package]]
+name = "http"
-+version = "0.2.3"
++version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+dependencies = [
-+ "bytes 1.0.1",
++ "bytes 1.2.1",
+ "fnv",
-+ "itoa",
++ "itoa 1.0.4",
+]
+
+[[package]]
@@ -789,9 +804,9 @@ index 0000000..f191345
+
+[[package]]
+name = "httparse"
-+version = "1.3.5"
++version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
@@ -814,7 +829,7 @@ index 0000000..f191345
+ "http-body",
+ "httparse",
+ "httpdate",
-+ "itoa",
++ "itoa 0.4.8",
+ "pin-project",
+ "socket2",
+ "tokio",
@@ -837,6 +852,30 @@ index 0000000..f191345
+]
+
+[[package]]
++name = "iana-time-zone"
++version = "0.1.53"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
++dependencies = [
++ "android_system_properties",
++ "core-foundation-sys",
++ "iana-time-zone-haiku",
++ "js-sys",
++ "wasm-bindgen",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "iana-time-zone-haiku"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
++dependencies = [
++ "cxx",
++ "cxx-build",
++]
++
++[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -844,9 +883,9 @@ index 0000000..f191345
+
+[[package]]
+name = "idna"
-+version = "0.2.2"
++version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
@@ -854,10 +893,20 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "indexmap"
-+version = "1.6.2"
++name = "idna"
++version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
++dependencies = [
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "indexmap"
++version = "1.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+dependencies = [
+ "autocfg",
+ "hashbrown",
@@ -865,9 +914,9 @@ index 0000000..f191345
+
+[[package]]
+name = "instant"
-+version = "0.1.9"
++version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+]
@@ -883,9 +932,9 @@ index 0000000..f191345
+
+[[package]]
+name = "ipnet"
-+version = "2.3.0"
++version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
++checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+
+[[package]]
+name = "itertools"
@@ -898,15 +947,21 @@ index 0000000..f191345
+
+[[package]]
+name = "itoa"
-+version = "0.4.7"
++version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
++
++[[package]]
++name = "itoa"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+
+[[package]]
+name = "jni"
-+version = "0.18.0"
++version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
++checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
@@ -924,18 +979,18 @@ index 0000000..f191345
+
+[[package]]
+name = "jobserver"
-+version = "0.1.21"
++version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
++checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
-+version = "0.3.50"
++version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+dependencies = [
+ "wasm-bindgen",
+]
@@ -981,30 +1036,39 @@ index 0000000..f191345
+
+[[package]]
+name = "libc"
-+version = "0.2.92"
++version = "0.2.137"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714"
++checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+
+[[package]]
+name = "libdbus-sys"
-+version = "0.2.1"
++version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0"
++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "libloading"
-+version = "0.7.0"
++version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
++checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
+]
+
+[[package]]
++name = "link-cplusplus"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
++dependencies = [
++ "cc",
++]
++
++[[package]]
+name = "linked-hash-map"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1016,33 +1080,34 @@ index 0000000..f191345
+
+[[package]]
+name = "linked-hash-map"
-+version = "0.5.4"
++version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "lock_api"
-+version = "0.4.2"
++version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
++ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
-+version = "0.4.14"
++version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "log-panics"
-+version = "2.0.0"
++version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef"
++checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f"
+dependencies = [
+ "log",
+]
@@ -1058,15 +1123,24 @@ index 0000000..f191345
+
+[[package]]
+name = "matches"
-+version = "0.1.8"
++version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+
+[[package]]
+name = "memchr"
-+version = "2.3.4"
++version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
++
++[[package]]
++name = "memoffset"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
++dependencies = [
++ "autocfg",
++]
+
+[[package]]
+name = "mime"
@@ -1076,15 +1150,21 @@ index 0000000..f191345
+
+[[package]]
+name = "mime_guess"
-+version = "2.0.3"
++version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
+[[package]]
++name = "minimal-lexical"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
++
++[[package]]
+name = "minimp3"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1106,12 +1186,11 @@ index 0000000..f191345
+
+[[package]]
+name = "miniz_oxide"
-+version = "0.4.4"
++version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
++checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
+dependencies = [
+ "adler",
-+ "autocfg",
+]
+
+[[package]]
@@ -1156,9 +1235,9 @@ index 0000000..f191345
+
+[[package]]
+name = "native-tls"
-+version = "0.2.7"
++version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
++checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static 1.4.0",
+ "libc",
@@ -1174,10 +1253,11 @@ index 0000000..f191345
+
+[[package]]
+name = "ndk"
-+version = "0.3.0"
++version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
++checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+dependencies = [
++ "bitflags",
+ "jni-sys",
+ "ndk-sys",
+ "num_enum",
@@ -1185,24 +1265,31 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "ndk-glue"
-+version = "0.3.0"
++name = "ndk-context"
++version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
++checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
++
++[[package]]
++name = "ndk-glue"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
+dependencies = [
+ "lazy_static 1.4.0",
+ "libc",
+ "log",
+ "ndk",
++ "ndk-context",
+ "ndk-macro",
+ "ndk-sys",
+]
+
+[[package]]
+name = "ndk-macro"
-+version = "0.2.0"
++version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
++checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
+dependencies = [
+ "darling",
+ "proc-macro-crate",
@@ -1213,15 +1300,18 @@ index 0000000..f191345
+
+[[package]]
+name = "ndk-sys"
-+version = "0.2.1"
++version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
++checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
++dependencies = [
++ "jni-sys",
++]
+
+[[package]]
+name = "net2"
-+version = "0.2.37"
++version = "0.2.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
++checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
@@ -1237,6 +1327,7 @@ index 0000000..f191345
+ "bytes 0.4.12",
+ "chrono",
+ "config",
++ "cpal",
+ "dbus",
+ "dirs",
+ "failure",
@@ -1248,11 +1339,11 @@ index 0000000..f191345
+ "mp3-duration",
+ "num-bigint",
+ "openssl",
-+ "rand 0.7.3",
++ "rand",
+ "regex",
+ "reqwest",
+ "rodio",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde_derive",
+ "serde_json",
+ "serde_urlencoded 0.6.1",
@@ -1266,14 +1357,15 @@ index 0000000..f191345
+
+[[package]]
+name = "nix"
-+version = "0.20.0"
++version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
++checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
++ "memoffset",
+]
+
+[[package]]
@@ -1288,12 +1380,12 @@ index 0000000..f191345
+
+[[package]]
+name = "nom"
-+version = "5.1.2"
++version = "7.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
++checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+dependencies = [
+ "memchr",
-+ "version_check 0.9.3",
++ "minimal-lexical",
+]
+
+[[package]]
@@ -1304,7 +1396,7 @@ index 0000000..f191345
+dependencies = [
+ "autocfg",
+ "num-integer",
-+ "num-traits 0.2.14",
++ "num-traits 0.2.15",
+]
+
+[[package]]
@@ -1320,12 +1412,12 @@ index 0000000..f191345
+
+[[package]]
+name = "num-integer"
-+version = "0.1.44"
++version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
-+ "num-traits 0.2.14",
++ "num-traits 0.2.15",
+]
+
+[[package]]
@@ -1334,23 +1426,23 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+dependencies = [
-+ "num-traits 0.2.14",
++ "num-traits 0.2.15",
+]
+
+[[package]]
+name = "num-traits"
-+version = "0.2.14"
++version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
-+version = "1.13.0"
++version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
++checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+dependencies = [
+ "hermit-abi",
+ "libc",
@@ -1358,19 +1450,18 @@ index 0000000..f191345
+
+[[package]]
+name = "num_enum"
-+version = "0.5.1"
++version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
++checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+dependencies = [
-+ "derivative",
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
-+version = "0.5.1"
++version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
++checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
@@ -1386,29 +1477,32 @@ index 0000000..f191345
+
+[[package]]
+name = "object"
-+version = "0.23.0"
++version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
++dependencies = [
++ "memchr",
++]
+
+[[package]]
+name = "oboe"
-+version = "0.4.1"
++version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4"
++checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
+dependencies = [
+ "jni",
+ "ndk",
-+ "ndk-glue",
++ "ndk-context",
+ "num-derive",
-+ "num-traits 0.2.14",
++ "num-traits 0.2.15",
+ "oboe-sys",
+]
+
+[[package]]
+name = "oboe-sys"
-+version = "0.4.0"
++version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103"
++checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
+dependencies = [
+ "cc",
+]
@@ -1424,35 +1518,47 @@ index 0000000..f191345
+
+[[package]]
+name = "once_cell"
-+version = "1.7.2"
++version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
++checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+
+[[package]]
+name = "openssl"
-+version = "0.10.33"
++version = "0.10.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
++checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
++ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
-+name = "openssl-probe"
-+version = "0.1.2"
++name = "openssl-macros"
++version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "openssl-probe"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
-+version = "0.9.61"
++version = "0.9.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
++checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+dependencies = [
+ "autocfg",
+ "cc",
@@ -1463,9 +1569,9 @@ index 0000000..f191345
+
+[[package]]
+name = "parking_lot"
-+version = "0.11.1"
++version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
@@ -1474,14 +1580,14 @@ index 0000000..f191345
+
+[[package]]
+name = "parking_lot_core"
-+version = "0.8.3"
++version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
++checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
-+ "redox_syscall 0.2.5",
++ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi 0.3.9",
+]
@@ -1494,24 +1600,24 @@ index 0000000..f191345
+
+[[package]]
+name = "percent-encoding"
-+version = "2.1.0"
++version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "pin-project"
-+version = "1.0.6"
++version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bc174859768806e91ae575187ada95c91a29e96a98dc5d2cd9a1fed039501ba6"
++checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
-+version = "1.0.6"
++version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a490329918e856ed1b083f244e3bfe2d8c4f336407e4ea9e1a9f479ff09049e5"
++checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -1526,9 +1632,9 @@ index 0000000..f191345
+
+[[package]]
+name = "pin-project-lite"
-+version = "0.2.6"
++version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "pin-utils"
@@ -1538,23 +1644,25 @@ index 0000000..f191345
+
+[[package]]
+name = "pkg-config"
-+version = "0.3.19"
++version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+
+[[package]]
+name = "ppv-lite86"
-+version = "0.2.10"
++version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
-+version = "0.1.5"
++version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
++checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+dependencies = [
-+ "toml 0.5.8",
++ "once_cell",
++ "thiserror",
++ "toml 0.5.9",
+]
+
+[[package]]
@@ -1564,18 +1672,12 @@ index 0000000..f191345
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
-+name = "proc-macro-nested"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-+
-+[[package]]
+name = "proc-macro2"
-+version = "1.0.26"
++version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+dependencies = [
-+ "unicode-xid",
++ "unicode-ident",
+]
+
+[[package]]
@@ -1584,15 +1686,15 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
+dependencies = [
-+ "idna",
++ "idna 0.2.3",
+ "url",
+]
+
+[[package]]
+name = "quote"
-+version = "1.0.9"
++version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
@@ -1605,21 +1707,9 @@ index 0000000..f191345
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
-+ "rand_chacha 0.2.2",
-+ "rand_core 0.5.1",
-+ "rand_hc 0.2.0",
-+]
-+
-+[[package]]
-+name = "rand"
-+version = "0.8.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
-+dependencies = [
-+ "libc",
-+ "rand_chacha 0.3.0",
-+ "rand_core 0.6.2",
-+ "rand_hc 0.3.0",
++ "rand_chacha",
++ "rand_core",
++ "rand_hc",
+]
+
+[[package]]
@@ -1629,17 +1719,7 @@ index 0000000..f191345
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
-+ "rand_core 0.5.1",
-+]
-+
-+[[package]]
-+name = "rand_chacha"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
-+dependencies = [
-+ "ppv-lite86",
-+ "rand_core 0.6.2",
++ "rand_core",
+]
+
+[[package]]
@@ -1652,30 +1732,12 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "rand_core"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
-+dependencies = [
-+ "getrandom 0.2.2",
-+]
-+
-+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
-+ "rand_core 0.5.1",
-+]
-+
-+[[package]]
-+name = "rand_hc"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
-+dependencies = [
-+ "rand_core 0.6.2",
++ "rand_core",
+]
+
+[[package]]
@@ -1686,9 +1748,9 @@ index 0000000..f191345
+
+[[package]]
+name = "redox_syscall"
-+version = "0.2.5"
++version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
@@ -1699,25 +1761,25 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
+dependencies = [
-+ "redox_syscall 0.2.5",
++ "redox_syscall 0.2.16",
+]
+
+[[package]]
+name = "redox_users"
-+version = "0.3.5"
++version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
-+ "getrandom 0.1.16",
-+ "redox_syscall 0.1.57",
-+ "rust-argon2",
++ "getrandom 0.2.8",
++ "redox_syscall 0.2.16",
++ "thiserror",
+]
+
+[[package]]
+name = "regex"
-+version = "1.4.5"
++version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
++checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
@@ -1726,9 +1788,9 @@ index 0000000..f191345
+
+[[package]]
+name = "regex-syntax"
-+version = "0.6.23"
++version = "0.6.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
++checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
+[[package]]
+name = "remove_dir_all"
@@ -1746,7 +1808,7 @@ index 0000000..f191345
+checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
+dependencies = [
+ "async-compression",
-+ "base64 0.13.0",
++ "base64 0.13.1",
+ "bytes 0.5.6",
+ "cookie",
+ "cookie_store",
@@ -1765,10 +1827,10 @@ index 0000000..f191345
+ "mime_guess",
+ "native-tls",
+ "percent-encoding",
-+ "pin-project-lite 0.2.6",
-+ "serde 1.0.125",
-+ "serde_urlencoded 0.7.0",
-+ "time 0.2.26",
++ "pin-project-lite 0.2.9",
++ "serde 1.0.147",
++ "serde_urlencoded 0.7.1",
++ "time 0.2.27",
+ "tokio",
+ "tokio-socks",
+ "tokio-tls",
@@ -1781,9 +1843,9 @@ index 0000000..f191345
+
+[[package]]
+name = "rodio"
-+version = "0.13.1"
++version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
++checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e"
+dependencies = [
+ "claxon",
+ "cpal",
@@ -1793,18 +1855,6 @@ index 0000000..f191345
+]
+
+[[package]]
-+name = "rust-argon2"
-+version = "0.8.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
-+dependencies = [
-+ "base64 0.13.0",
-+ "blake2b_simd",
-+ "constant_time_eq",
-+ "crossbeam-utils",
-+]
-+
-+[[package]]
+name = "rust-ini"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1812,9 +1862,9 @@ index 0000000..f191345
+
+[[package]]
+name = "rustc-demangle"
-+version = "0.1.18"
++version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
++checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
+[[package]]
+name = "rustc-hash"
@@ -1833,9 +1883,9 @@ index 0000000..f191345
+
+[[package]]
+name = "ryu"
-+version = "1.0.5"
++version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+
+[[package]]
+name = "same-file"
@@ -1848,12 +1898,12 @@ index 0000000..f191345
+
+[[package]]
+name = "schannel"
-+version = "0.1.19"
++version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+dependencies = [
+ "lazy_static 1.4.0",
-+ "winapi 0.3.9",
++ "windows-sys",
+]
+
+[[package]]
@@ -1863,25 +1913,31 @@ index 0000000..f191345
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
-+name = "security-framework"
-+version = "2.2.0"
++name = "scratch"
++version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
++checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
++
++[[package]]
++name = "security-framework"
++version = "2.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+dependencies = [
+ "bitflags",
+ "core-foundation",
-+ "core-foundation-sys 0.8.2",
++ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
-+version = "2.2.0"
++version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
-+ "core-foundation-sys 0.8.2",
++ "core-foundation-sys",
+ "libc",
+]
+
@@ -1908,9 +1964,9 @@ index 0000000..f191345
+
+[[package]]
+name = "serde"
-+version = "1.0.125"
++version = "1.0.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
++checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+dependencies = [
+ "serde_derive",
+]
@@ -1930,9 +1986,9 @@ index 0000000..f191345
+
+[[package]]
+name = "serde_derive"
-+version = "1.0.125"
++version = "1.0.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
++checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -1941,13 +1997,13 @@ index 0000000..f191345
+
+[[package]]
+name = "serde_json"
-+version = "1.0.64"
++version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
++checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7"
+dependencies = [
-+ "itoa",
++ "itoa 1.0.4",
+ "ryu",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+]
+
+[[package]]
@@ -1966,34 +2022,43 @@ index 0000000..f191345
+checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
+dependencies = [
+ "dtoa",
-+ "itoa",
-+ "serde 1.0.125",
++ "itoa 0.4.8",
++ "serde 1.0.147",
+ "url",
+]
+
+[[package]]
+name = "serde_urlencoded"
-+version = "0.7.0"
++version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
-+ "itoa",
++ "itoa 1.0.4",
+ "ryu",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+]
+
+[[package]]
+name = "sha1"
-+version = "0.6.0"
++version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
++checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
++dependencies = [
++ "sha1_smol",
++]
++
++[[package]]
++name = "sha1_smol"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
+[[package]]
+name = "shlex"
-+version = "0.1.1"
++version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
++checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
+[[package]]
+name = "simple-logging"
@@ -2008,9 +2073,12 @@ index 0000000..f191345
+
+[[package]]
+name = "slab"
-+version = "0.4.2"
++version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
++dependencies = [
++ "autocfg",
++]
+
+[[package]]
+name = "slice-deque"
@@ -2025,9 +2093,9 @@ index 0000000..f191345
+
+[[package]]
+name = "smallvec"
-+version = "1.6.1"
++version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
++checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "socket2"
@@ -2046,7 +2114,7 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
+dependencies = [
-+ "version_check 0.9.3",
++ "version_check 0.9.4",
+]
+
+[[package]]
@@ -2077,7 +2145,7 @@ index 0000000..f191345
+dependencies = [
+ "proc-macro2",
+ "quote",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde_derive",
+ "syn",
+]
@@ -2091,7 +2159,7 @@ index 0000000..f191345
+ "base-x",
+ "proc-macro2",
+ "quote",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde_derive",
+ "serde_json",
+ "sha1",
@@ -2106,26 +2174,26 @@ index 0000000..f191345
+
+[[package]]
+name = "strsim"
-+version = "0.9.3"
++version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
-+version = "1.0.68"
++version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87"
++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+dependencies = [
+ "proc-macro2",
+ "quote",
-+ "unicode-xid",
++ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
-+version = "0.12.4"
++version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -2135,19 +2203,28 @@ index 0000000..f191345
+
+[[package]]
+name = "tempfile"
-+version = "3.2.0"
++version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+dependencies = [
+ "cfg-if 1.0.0",
++ "fastrand",
+ "libc",
-+ "rand 0.8.3",
-+ "redox_syscall 0.2.5",
++ "redox_syscall 0.2.16",
+ "remove_dir_all",
+ "winapi 0.3.9",
+]
+
+[[package]]
++name = "termcolor"
++version = "1.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
+name = "termion"
+version = "1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2155,24 +2232,24 @@ index 0000000..f191345
+dependencies = [
+ "libc",
+ "numtoa",
-+ "redox_syscall 0.2.5",
++ "redox_syscall 0.2.16",
+ "redox_termios",
+]
+
+[[package]]
+name = "thiserror"
-+version = "1.0.24"
++version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
-+version = "1.0.24"
++version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -2192,26 +2269,27 @@ index 0000000..f191345
+
+[[package]]
+name = "time"
-+version = "0.1.43"
++version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
++ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "time"
-+version = "0.2.26"
++version = "0.2.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372"
++checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+dependencies = [
+ "const_fn",
+ "libc",
+ "standback",
+ "stdweb 0.4.20",
+ "time-macros",
-+ "version_check 0.9.3",
++ "version_check 0.9.4",
+ "winapi 0.3.9",
+]
+
@@ -2227,9 +2305,9 @@ index 0000000..f191345
+
+[[package]]
+name = "time-macros-impl"
-+version = "0.1.1"
++version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
++checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
@@ -2240,9 +2318,9 @@ index 0000000..f191345
+
+[[package]]
+name = "tinyvec"
-+version = "1.1.1"
++version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
@@ -2326,43 +2404,43 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
+dependencies = [
-+ "serde 1.0.125",
++ "serde 1.0.147",
+]
+
+[[package]]
+name = "toml"
-+version = "0.5.8"
++version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+dependencies = [
-+ "serde 1.0.125",
++ "serde 1.0.147",
+]
+
+[[package]]
+name = "tower-service"
-+version = "0.3.1"
++version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
-+version = "0.1.25"
++version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
++checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "log",
-+ "pin-project-lite 0.2.6",
++ "pin-project-lite 0.2.9",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
-+version = "0.1.17"
++version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+dependencies = [
-+ "lazy_static 1.4.0",
++ "once_cell",
+]
+
+[[package]]
@@ -2403,62 +2481,64 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
-+ "version_check 0.9.3",
++ "version_check 0.9.4",
+]
+
+[[package]]
+name = "unicode-bidi"
-+version = "0.3.4"
++version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+dependencies = [
-+ "matches",
-+]
++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
++
++[[package]]
++name = "unicode-ident"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "unicode-normalization"
-+version = "0.1.17"
++version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
-+version = "1.7.1"
++version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+
+[[package]]
+name = "unicode-width"
-+version = "0.1.8"
++version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode-xid"
-+version = "0.2.1"
++version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "url"
-+version = "2.2.1"
++version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
-+ "idna",
-+ "matches",
++ "idna 0.3.0",
+ "percent-encoding",
+]
+
+[[package]]
+name = "vcpkg"
-+version = "0.2.11"
++version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
@@ -2468,9 +2548,9 @@ index 0000000..f191345
+
+[[package]]
+name = "version_check"
-+version = "0.9.3"
++version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "walkdir"
@@ -2501,31 +2581,37 @@ index 0000000..f191345
+
+[[package]]
+name = "wasi"
-+version = "0.10.2+wasi-snapshot-preview1"
++version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
++
++[[package]]
++name = "wasi"
++version = "0.11.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
-+version = "0.2.73"
++version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
+dependencies = [
+ "cfg-if 1.0.0",
-+ "serde 1.0.125",
++ "serde 1.0.147",
+ "serde_json",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
-+version = "0.2.73"
++version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
+dependencies = [
+ "bumpalo",
-+ "lazy_static 1.4.0",
+ "log",
++ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
@@ -2534,9 +2620,9 @@ index 0000000..f191345
+
+[[package]]
+name = "wasm-bindgen-futures"
-+version = "0.4.23"
++version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
@@ -2546,9 +2632,9 @@ index 0000000..f191345
+
+[[package]]
+name = "wasm-bindgen-macro"
-+version = "0.2.73"
++version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
@@ -2556,9 +2642,9 @@ index 0000000..f191345
+
+[[package]]
+name = "wasm-bindgen-macro-support"
-+version = "0.2.73"
++version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+dependencies = [
+ "proc-macro2",
+ "quote",
@@ -2569,15 +2655,15 @@ index 0000000..f191345
+
+[[package]]
+name = "wasm-bindgen-shared"
-+version = "0.2.73"
++version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+
+[[package]]
+name = "web-sys"
-+version = "0.3.50"
++version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
@@ -2627,6 +2713,49 @@ index 0000000..f191345
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
++name = "windows-sys"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
++dependencies = [
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_msvc",
++]
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.36.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
++
++[[package]]
+name = "winreg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2651,5 +2780,5 @@ index 0000000..f191345
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
-+ "linked-hash-map 0.5.4",
++ "linked-hash-map 0.5.6",
+]
diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix
index f6ccee3e535e..90d645804b77 100644
--- a/pkgs/applications/audio/netease-music-tui/default.nix
+++ b/pkgs/applications/audio/netease-music-tui/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "netease-music-tui";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "betta-cyber";
repo = "netease-music-tui";
rev = "v${version}";
- sha256 = "sha256-ILJkejRKG2DRXgR6O2tAFbrbd8HtnLZJmITq7hF41DQ=";
+ sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg=";
};
cargoPatches = [ ./cargo-lock.patch ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib openssl ];
- cargoSha256 = "sha256-/JQDUtSSkuO9nrYVSkQOaZjps1BUuH8Bc1SMyDSSJS4=";
+ cargoSha256 = "sha256-i+W/KwnqdaHcrdaWYUuCUeFlRKekVuEvFh/pxDolPNU=";
meta = with lib; {
homepage = "https://github.com/betta-cyber/netease-music-tui";
diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix
index ef31c2a6ee99..8b76132a847f 100644
--- a/pkgs/applications/audio/pyradio/default.nix
+++ b/pkgs/applications/audio/pyradio/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
- version = "0.8.9.28";
+ version = "0.8.9.31";
src = fetchFromGitHub {
owner = "coderholic";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-0j0AQZk+WEkcRTL/peAxzRw23gThlGtMnqoms2aUCrc=";
+ sha256 = "sha256-9Fc42f0plduihXDDLXWBdt62maxDJ0cwumIvbiMcrGc=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix
index 24c8e610a692..89adea497c24 100644
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "tauon";
- version = "7.4.3";
+ version = "7.4.5";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
- sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0=";
+ sha256 = "sha256-fxmCLjnYO7ZblEiRoByxuFzw9xFHqbQvne1WNcFnnwI=";
};
postUnpack = ''
@@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The Linux desktop music player from the future";
homepage = "https://tauonmusicbox.rocks/";
+ changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}";
license = licenses.gpl3;
maintainers = with maintainers; [ jansol ];
platforms = platforms.linux;
diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix
index e7826fc6e949..44f5c5acfb9b 100644
--- a/pkgs/applications/backup/ludusavi/default.nix
+++ b/pkgs/applications/backup/ludusavi/default.nix
@@ -13,7 +13,7 @@
, libXrandr
, libXi
, gnome
-, kdialog
+, libsForQt5
}:
rustPlatform.buildRustPackage rec {
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
in
''
patchelf --set-rpath "${libPath}" "$out/bin/$pname"
- wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]}
+ wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]}
'';
diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix
index 7c92cc0831d6..6b6cfaa2398d 100644
--- a/pkgs/applications/blockchains/dogecoin/default.nix
+++ b/pkgs/applications/blockchains/dogecoin/default.nix
@@ -2,7 +2,7 @@
, pkg-config, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc, libevent
, protobuf, qtbase ? null
-, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode
+, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode
, withGui, withUpnp ? true, withUtils ? true, withWallet ? true
, withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }:
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 69a5213ef2c0..3e0109aaef8a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1301,6 +1301,7 @@ self: super: {
"coc-jest"
"coc-json"
"coc-lists"
+ "coc-ltex"
"coc-markdownlint"
"coc-metals"
"coc-pairs"
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 874417216c7d..cff8e68ada1f 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -874,8 +874,8 @@ let
mktplcRef = {
name = "gitlens";
publisher = "eamodio";
- version = "12.1.2";
- sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9";
+ version = "2022.11.2204";
+ sha256 = "0npr9fymfjnrq7xvfj6fdc04lysz28qncf9r8syv0w9873f3695h";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
@@ -1322,8 +1322,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.215";
- sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM=";
+ version = "0.0.220";
+ sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk";
};
meta = with lib; {
license = licenses.mit;
@@ -1502,8 +1502,8 @@ let
mktplcRef = {
name = "svg";
publisher = "jock";
- version = "1.4.19";
- sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq";
+ version = "1.4.23";
+ sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims";
};
meta = with lib; {
license = licenses.mit;
@@ -1514,8 +1514,8 @@ let
mktplcRef = {
name = "vscode-peacock";
publisher = "johnpapa";
- version = "4.0.1";
- sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI=";
+ version = "4.2.2";
+ sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m";
};
meta = with lib; {
license = licenses.mit;
@@ -1812,8 +1812,8 @@ let
mktplcRef = {
name = "vscode-docker";
publisher = "ms-azuretools";
- version = "1.22.1";
- sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52";
+ version = "1.22.2";
+ sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi";
};
meta = {
license = lib.licenses.mit;
@@ -1876,8 +1876,8 @@ let
mktplcRef = {
name = "PowerShell";
publisher = "ms-vscode";
- version = "2022.7.2";
- sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk=";
+ version = "2022.11.0";
+ sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19";
};
meta = with lib; {
description = "A Visual Studio Code extension for PowerShell language support";
@@ -2117,8 +2117,8 @@ let
mktplcRef = {
name = "vscode-yaml";
publisher = "redhat";
- version = "1.9.1";
- sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w";
+ version = "1.11.10112022";
+ sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x";
};
meta = {
license = lib.licenses.mit;
@@ -2173,8 +2173,8 @@ let
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
- version = "4.19.0";
- sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4";
+ version = "4.22.0";
+ sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk";
};
meta = {
license = lib.licenses.mit;
diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix
index 035351885568..ad43f31a1255 100644
--- a/pkgs/applications/emulators/sameboy/default.nix
+++ b/pkgs/applications/emulators/sameboy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
+{ lib, stdenv, fetchpatch, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }:
stdenv.mkDerivation rec {
pname = "sameboy";
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ rgbds glib wrapGAppsHook ];
buildInputs = [ SDL2 ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/LIJI32/SameBoy/commit/c0966ceebaf1cf2518427ffa3c0189d8f96ab5aa.patch";
+ hash = "sha256-2o/aWimtAKqay7SGq5Q9vLDcQKqV6Bn2xJtnjACrLUw=";
+ })
+ ];
+
makeFlags = [
"CONF=release"
"FREEDESKTOP=true"
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
deleted file mode 100644
index 2bb480a54f4d..000000000000
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
-
-stdenv.mkDerivation rec {
- pname = "openexr_viewers";
- version = "2.2.1";
-
- src = fetchurl {
- url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz";
- sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
- };
-
- configurePhase = ''
- ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
- '';
-
- buildPhase = ''
- make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
- '';
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openexr fltk libGLU libGL ctl ];
-
- meta = {
- description = "Application for viewing OpenEXR images on a display at various exposure settings";
- homepage = "http://openexr.com";
- platforms = lib.platforms.linux;
- license = lib.licenses.bsd3;
- };
-}
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
deleted file mode 100644
index b62ca680cbc5..000000000000
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:
-
-with lib;
-stdenv.mkDerivation rec {
- pname = "screencloud";
- version = "1.2.0";
-
- # API Keys. According to the author of the AUR package, these are only used
- # for tracking usage.
- consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
- consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
-
- src = fetchFromGitHub {
- owner = "olav-st";
- repo = "screencloud";
- rev = "v${version}";
- sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];
-
- patchPhase = ''
- # Required to make the configure script work. Normally, screencloud's
- # CMakeLists file sets the install prefix to /opt by force. This is stupid
- # and breaks nix, so we force it to install where we want. Please don't
- # write CMakeLists files like this, as things like this are why we can't
- # have nice things.
- substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
- '';
-
- # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
- # to add the argument for us.
- dontAddPrefix = true;
-
- cmakeFlags = [
- "-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore"
- "-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so"
- "-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui"
- "-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so"
- "-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}"
- "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
- ];
-
- setSourceRoot = ''
- sourceRoot=$(echo */screencloud)
- '';
-
- preConfigure = ''
- # This needs to be set in preConfigure instead of cmakeFlags in order to
- # access the $prefix environment variable.
- export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags"
- '';
-
- # There are a number of issues with screencloud's installation. We need to add
- # pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and
- # we need to move the libPythonQt library into a folder where it can actually
- # be found.
- postInstall = ''
- patchShebangs $prefix/opt/screencloud/screencloud.sh
- substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
- sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
- mkdir $prefix/bin
- mkdir $prefix/lib
- ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud
- ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so
- '';
-
- meta = {
- homepage = "https://screencloud.net/";
- description = "Client for Screencloud, an easy to use screenshot sharing tool";
- license = lib.licenses.gpl2;
- maintainers = with lib.maintainers; [ forkk ];
- platforms = with lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 49bacebdab93..bfe380275899 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hugo";
- version = "0.106.0";
+ version = "0.107.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Dyre/ou0kjEqbq8WGGM/n8+JBTMNslbnmj+5clYJUHs=";
+ sha256 = "sha256-8Ru1T6GSz5TfMxFvUU2QgpiWNLJK+ky723qc3flrDIw=";
};
- vendorSha256 = "sha256-dhsGGu4uNrqKv6szGqruAcI2UTbbXknKaKk5pVCQB5A=";
+ vendorSha256 = "sha256-92QLkSUrwMEZ/8pIeOj4KKtC47oN+ITxJnpp7Fb0Z10=";
doCheck = false;
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6dbe3d840415..10bb6a782707 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -123,13 +123,13 @@ rec {
gammastep = mkRedshift rec {
pname = "gammastep";
- version = "2.0.8";
+ version = "2.0.9";
src = fetchFromGitLab {
owner = "chinstrap";
repo = pname;
rev = "v${version}";
- sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1";
+ sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU=";
};
meta = redshift.meta // {
diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index 3f1efb47a28f..48eb65d8e18c 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "2.14.2";
+ version = "2.14.3";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dcLzD+dzQ6Uj4XlXT4bKFniS/ZB9MBrqxEzM6SwnPes=";
+ sha256 = "sha256-7bCl8VfkMhoTBnr+O+oBYQeSV2sRwlP/qUkNkYerZdU=";
};
vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4=";
diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix
index 7eccdbcc8d48..4d0936c0b431 100644
--- a/pkgs/applications/misc/tippecanoe/default.nix
+++ b/pkgs/applications/misc/tippecanoe/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe";
- version = "2.13.0";
+ version = "2.13.1";
src = fetchFromGitHub {
owner = "felt";
repo = "tippecanoe";
rev = finalAttrs.version;
- hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls=";
+ hash = "sha256-cDNaZ3ZYCUWg30Td1hlzzaB46tI7cFZLvgwCAZN72QI=";
};
buildInputs = [ sqlite zlib ];
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix
index 37cc10c3823c..6bf83be75703 100644
--- a/pkgs/applications/misc/tty-share/default.nix
+++ b/pkgs/applications/misc/tty-share/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tty-share";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "elisescu";
repo = "tty-share";
rev = "v${version}";
- sha256 = "sha256-/oK2m2kxmF9HHYfTK6NlZxKKkDS7Oay+ed7jR/+szs0=";
+ sha256 = "sha256-7rNSBpiZslUGWw0P/Q1zRtNxo9MN8Vq6hG8pD6bJIsA=";
};
# Upstream has a `./vendor` directory with all deps which we rely upon.
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index 51b21a31cf2e..a47c509c4311 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
- version = "1.0.19";
+ version = "1.0.22";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
- sha256 = "sha256-lT/3KXxrZYOK/oGrlorQUIv8J7tAfME0hRb1bwN+nXA=";
+ sha256 = "sha256-wFK5dFGD25KtBn4gujgvDu8zZWQ8XH1peEbpLa+6n8A=";
};
- vendorSha256 = "sha256-O7tre7eSGlB9mnf/9aNbe/Ji0ecmJyuLuaWKARskCjI=";
+ vendorSha256 = "sha256-HZrchLQ1861MYWDiiegXLNMDsDUzRNzLA7MoULBai+4=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";
diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix
index 580faa360268..f3a0f25552d9 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/applications/misc/xygrib/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:
stdenv.mkDerivation rec {
- version = "1.2.6.1";
+ version = "unstable-2022-05-16";
pname = "xygrib";
src = fetchFromGitHub {
owner = "opengribs";
repo = "XyGrib";
- rev = "v${version}";
- sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia";
+ rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310";
+ sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A=";
};
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ j03 SuperSandro2000 ];
+ maintainers = with maintainers; [ j03 ];
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 39a2f3d18369..523a9b251809 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -295,7 +295,14 @@ let
chrome_pgo_phase = 0;
clang_base_path = "${llvmPackages.clang}";
use_qt = false;
+ } // optionalAttrs (!chromiumVersionAtLeast "108") {
use_system_libwayland_server = true;
+ } // optionalAttrs (chromiumVersionAtLeast "108") {
+ # The default has changed to false. We'll build with libwayland from
+ # Nixpkgs for now but might want to eventually use the bundled libwayland
+ # as well to avoid incompatibilities (if this continues to be a problem
+ # from time to time):
+ use_system_libwayland = true;
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 0362095bce69..1bc55b3db4ff 100644
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
- version = "0.27.0";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E=";
+ sha256 = "sha256-8OW0n6aS7bDDbzbrMfJLL8Yvq3vJg47qHQB4zY0xxAw=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 55086342d791..b15f60afe016 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.40.2";
+ version = "0.41.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wNedd6C4NPLPw8CA1tyKx2MWsKatFbN4xt3Us2SC/ME=";
+ sha256 = "sha256-1if7Z+4Lr5eevf1NUJn//pcVU3Ts/FznDd/604aJO/c=";
};
vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA=";
diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix
new file mode 100644
index 000000000000..6b3b7f284302
--- /dev/null
+++ b/pkgs/applications/networking/diswall/default.nix
@@ -0,0 +1,33 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "diswall";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "dis-works";
+ repo = "diswall-rs";
+ rev = "v${version}";
+ sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c=";
+ };
+
+ cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s=";
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Distributed firewall";
+ longDescription = ''
+ Diswall (distributed firewall) - a client of distributed firewall
+ working on many servers and using NATS for the transport level.
+ Its purpose - blocking IPs with a blink of the eye on all servers
+ in any infrastructure when some IP checks any of the closed ports
+ of anyone of these servers. Therefore, diswall provides good
+ protection of whole infrastructure (as anti-shodan) preventing
+ intruder to get any system information.
+ '';
+ homepage = "https://www.diswall.stream";
+ license = with licenses; [ gpl3 ];
+ maintainers = with maintainers; [ izorkin ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 864c70f1917b..6af1c2ec738a 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -16,7 +16,6 @@ let
pinData = lib.importJSON ./pin.json;
noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org
- piwik = false; # disable analytics
};
unwrapped = stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 1be323decab4..62f44f6f134a 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -56,9 +56,11 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "GUI front-end for maestral (an open-source Dropbox client) for Linux";
+ homepage = "https://maestral.app";
+ changelog = "https://github.com/samschott/maestral/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg sfrijters ];
platforms = platforms.linux;
- homepage = "https://maestral.app";
+ mainProgram = "maestral_qt";
};
}
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index a08ea4b8bbc2..b8f64aba2ec3 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,72 +1,64 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }:
+{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll }:
let
- freenet_ext = fetchurl {
- url = "https://downloads.freenetproject.org/latest/freenet-ext.jar";
- sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
+ version = "build01494";
+ jna = fetchurl {
+ url = "https://github.com/freenet/fred/releases/download/${version}/jna-4.5.2.jar";
+ sha256 = "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=";
+ };
+ jna_platform = fetchurl {
+ url = "https://github.com/freenet/fred/releases/download/${version}/jna-platform-4.5.2.jar";
+ sha256 = "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=";
+ };
+ freenet_ext = fetchurl {
+ url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar";
+ sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
};
-
- bcprov_version = "jdk15on-154";
bcprov = fetchurl {
- url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar";
- sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk";
+ url = "https://github.com/freenet/fred/releases/download/${version}/bcprov-jdk15on-1.59.jar";
+ sha256 = "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=";
};
seednodes = fetchurl {
url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref";
sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv";
};
- version = "build01480";
freenet-jars = stdenv.mkDerivation {
pname = "freenet-jars";
inherit version;
- src = fetchFromGitHub {
- owner = "freenet";
- repo = "fred";
- rev = version;
- sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb";
+ src = fetchurl {
+ url = "https://github.com/freenet/fred/releases/download/${version}/freenet.jar";
+ sha256 = "sha256-1Pjc8Ob4EN7N05QkGTMKBn7z3myTDaQ98N48nNSLstg=";
};
- patchPhase = ''
- cp ${freenet_ext} lib/freenet/freenet-ext.jar
- cp ${bcprov} lib/bcprov-${bcprov_version}.jar
-
- sed '/antcall.*-ext/d' -i build.xml
- sed 's/@unknown@/${version}/g' -i build-clean.xml
- '';
-
- buildInputs = [ ant jdk ];
-
- buildPhase = "ant package-only";
+ dontUnpack = true;
installPhase = ''
mkdir -p $out/share/freenet
- cp lib/bcprov-${bcprov_version}.jar $out/share/freenet
- cp lib/freenet/freenet-ext.jar $out/share/freenet
- cp dist/freenet.jar $out/share/freenet
+ ln -s ${bcprov} $out/share/freenet/bcprov.jar
+ ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
+ ln -s ${jna_platform} $out/share/freenet/jna_platform.jar
+ ln -s ${jna} $out/share/freenet/jna.jar
+ ln -s $src $out/share/freenet/freenet.jar
'';
};
in stdenv.mkDerivation {
- name = "freenet-${version}";
+ pname = "freenet";
inherit version;
src = substituteAll {
src = ./freenetWrapper;
- inherit bash coreutils seednodes bcprov_version;
+ inherit bash coreutils jdk seednodes;
freenet = freenet-jars;
- jre = jdk.jre;
};
- jars = freenet-jars;
-
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
- cp $src $out/bin/freenet
- chmod +x $out/bin/freenet
+ install -Dm555 $src $out/bin/freenet
ln -s ${freenet-jars}/share $out/share
'';
@@ -75,7 +67,7 @@ in stdenv.mkDerivation {
homepage = "https://freenetproject.org/";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.gpl2Plus;
- maintainers = [ ];
+ maintainers = with lib.maintainers; [ nagy ];
platforms = with lib.platforms; linux;
};
}
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index f3106265801f..76faf601e69c 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -1,18 +1,17 @@
#! @bash@/bin/bash
-
+set -eo pipefail
PATH=@coreutils@/bin:$PATH
+export CLASSPATH=@freenet@/share/freenet/bcprov.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/jna_platform.jar:@freenet@/share/freenet/jna.jar:@freenet@/share/freenet/freenet.jar
export FREENET_HOME="$HOME/.local/share/freenet"
-if [ -n "$XDG_DATA_HOME" ]
- then export FREENET_HOME="$XDG_DATA_HOME/freenet"
+if [ -n "$XDG_DATA_HOME" ] ; then
+ FREENET_HOME="$XDG_DATA_HOME/freenet"
fi
-if [ ! -d $FREENET_HOME ]; then
- mkdir -p $FREENET_HOME
-fi
+mkdir -p -- $FREENET_HOME
-cp -u @seednodes@ $FREENET_HOME/seednodes.fref
-chmod u+rw $FREENET_HOME/seednodes.fref
+cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
+chmod u+rw -- $FREENET_HOME/seednodes.fref
-cd $FREENET_HOME
-@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
+cd -- $FREENET_HOME
+exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index b0a0fded80ae..331e6a7c3a26 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
+{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "cb2bib";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
};
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
- nativeBuildInputs = [ qmake ];
+ nativeBuildInputs = [ qmake wrapQtAppsHook ];
configurePhase = ''
runHook preConfigure
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
- dontWrapQtApps = true;
-
meta = with lib; {
description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
homepage = "http://www.molspaces.com/d_cb2bib-overview.php";
diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix
index 0c913cd7df20..7e171f7d702c 100644
--- a/pkgs/applications/office/tagainijisho/default.nix
+++ b/pkgs/applications/office/tagainijisho/default.nix
@@ -1,11 +1,11 @@
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
mkDerivation rec {
pname = "tagainijisho";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchzip {
url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
- hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8=";
+ hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix
index 03db1cf3cf85..90830ae9ffca 100755
--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@@ -1,41 +1,41 @@
{
# Nix
- lib,
- buildPythonApplication,
- fetchPypi,
-
- # Build inputs
- altair,
- blinker,
- click,
- cachetools,
- GitPython,
- importlib-metadata,
- jinja2,
- pillow,
- pyarrow,
- pydeck,
- pympler,
- protobuf,
- requests,
- rich,
- semver,
- setuptools,
- toml,
- tornado,
- tzlocal,
- validators,
- watchdog,
+ lib
+, buildPythonApplication
+, fetchPypi
+, # Build inputs
+ altair
+, blinker
+, click
+, cachetools
+, GitPython
+, importlib-metadata
+, jinja2
+, pillow
+, pyarrow
+, pydeck
+, pympler
+, protobuf3
+, requests
+, rich
+, semver
+, setuptools
+, toml
+, tornado
+, tzlocal
+, validators
+, watchdog
+,
}:
buildPythonApplication rec {
pname = "streamlit";
- version = "1.13.0";
- format = "wheel"; # source currently requires pipenv
+ version = "1.15.0";
+ format = "wheel"; # source currently requires pipenv
src = fetchPypi {
inherit pname version format;
- hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo=";
+ hash = "sha256-QtBr3INWBwCBab+FzmvzrjGjwVVHC8NCET9wtRVeVbc=";
};
propagatedBuildInputs = [
@@ -47,7 +47,7 @@ buildPythonApplication rec {
importlib-metadata
jinja2
pillow
- protobuf
+ protobuf3
pyarrow
pydeck
pympler
@@ -63,7 +63,7 @@ buildPythonApplication rec {
];
postInstall = ''
- rm $out/bin/streamlit.cmd # remove windows helper
+ rm $out/bin/streamlit.cmd # remove windows helper
'';
meta = with lib; {
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 933ad45fd519..0aa167216e8a 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"--with-gmp=${lib.getDev gmp}"
"--with-readline=${lib.getDev readline}"
]
- ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin"
+ ++ lib.optional stdenv.isDarwin "--host=${stdenv.system}"
++ lib.optional withThread "--mt=pthread";
preConfigure = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
'';
postConfigure = lib.optionalString stdenv.isDarwin ''
- echo 'echo x86_64-darwin' > config/arch-osname
+ echo 'echo ${stdenv.system}' > config/arch-osname
'';
makeFlags = [ "all" ];
@@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes ] ++ teams.sage.members;
platforms = platforms.linux ++ platforms.darwin;
- broken = stdenv.isDarwin && stdenv.isAarch64;
mainProgram = "gp";
};
}
diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix
index ce712ef182b0..b06cfaae66b5 100644
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/applications/science/misc/graphia/default.nix
@@ -2,6 +2,7 @@
, lib
, cmake
, fetchFromGitHub
+, fetchpatch
, wrapQtAppsHook
, qtbase
, qtquickcontrols2
@@ -10,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "graphia";
- version = "3.1";
+ version = "3.2";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
- sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk=";
+ sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg=";
};
patches = [
@@ -24,6 +25,12 @@ stdenv.mkDerivation rec {
# https://github.com/pytorch/pytorch/issues/70297
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
./breakpad-sigstksz.patch
+
+ # FIXME: backport patch fixing build with Qt 5.15, remove for next release
+ (fetchpatch {
+ url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch";
+ hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix
index 564bcdc5897b..a60aa27a8439 100644
--- a/pkgs/applications/version-management/fnc/default.nix
+++ b/pkgs/applications/version-management/fnc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fnc";
- version = "0.12";
+ version = "0.13";
src = fetchurl {
url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz";
- sha256 = "05cg8id4d1ia8y60y3x23167bl1rn2fdpkf1jfj3aklhlihvkbxd";
+ sha256 = "126aklsjfqmrj0f9p1g6sdlqhwnbfhyn0lq2c9pidfnhppa7sz95";
};
buildInputs = [ libiconv ncurses zlib ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix
index 6ec4589f570e..4857384148d8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-team/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix
@@ -1,49 +1,39 @@
{ lib
, buildGoModule
, fetchFromGitHub
-, fetchpatch
+, go-mockery
, installShellFiles
}:
buildGoModule rec {
pname = "git-team";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "hekmekk";
repo = "git-team";
rev = "v${version}";
- hash = "sha256-pHKfehPyy01uVN6kjjPGtdkltw7FJ+HmIlwGs4iRhVo=";
+ hash = "sha256-LZR30zqwit/xydQbpGm1LXd/tno/sTCaftgjVkVS6ZY=";
};
- patches = [
- (fetchpatch {
- name = "1-update-dependencies-for-go-1.18.patch";
- url = "https://github.com/hekmekk/git-team/commit/d8632d9938379293521f9b3f2a93df680dd13a31.patch";
- hash = "sha256-hlmjPf3qp8WPNSH+GgkqATDiKIRzo+t81Npkptw8vgI=";
- })
- (fetchpatch {
- name = "2-update-dependencies-for-go-1.18.patch";
- url = "https://github.com/hekmekk/git-team/commit/f6acc96c2ffe76c527f2f2897b368cbb631d738c.patch";
- hash = "sha256-Pe+UAK9N1NpXhFGYv9l1iZ1/fCCqnT8OSgKdt/vUqO4=";
- })
- (fetchpatch {
- name = "3-update-dependencies-for-go-1.18.patch";
- url = "https://github.com/hekmekk/git-team/commit/2f38137298e4749a8dfe37e085015360949e73ad.patch";
- hash = "sha256-+6C8jp/qwYVmbL+SpV9FJIVyBRvX4tXBcoHMB//nNTk=";
- })
+ vendorHash = "sha256-NTOUL1oE2IhgLyYYHwRCMW5yCxIRxUwqkfuhSSBXf6A=";
+
+ nativeBuildInputs = [
+ go-mockery
+ installShellFiles
];
- vendorSha256 = "sha256-GdwksPmYEGTq/FkG/rvn3o0zMKU1cSkpgZ+GrfVgLWM=";
-
- nativeBuildInputs = [ installShellFiles ];
+ preBuild = ''
+ mockery --dir=src/ --all --keeptree
+ '';
postInstall = ''
- go run main.go --generate-man-page > ${pname}.1
- installManPage ${pname}.1
+ go run main.go --generate-man-page > git-team.1
+ installManPage git-team.1
- # Currently only bash completions are provided
- installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash)
+ installShellCompletion --cmd git-team \
+ --bash <($out/bin/git-team completion bash) \
+ --zsh <($out/bin/git-team completion zsh)
'';
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index def387980d63..6b019e50887c 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lefthook";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
- sha256 = "sha256-ZMqqiPSNNJw9t3p5h/GUHa9cvl9LcJ4u0HMf1ag8qCc=";
+ sha256 = "sha256-66exuMb0dUQWRhcDUU7mAJ06yD/acKX96KIQwMEU6xM=";
};
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index 2f207e8ee474..d2a51c94727a 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
- sha256 = "sha256-VB7v51YW4aA5WHVD5ZWFzv9hQskjQeqMzm+pQ9glODg=";
+ sha256 = "sha256-GGXujTn5Xb63vKIycj5o9+PCsMN1Kp3RCSg1wiM31qA=";
};
- cargoSha256 = "sha256-uII6o/cJktpUFxROuu11dNSXx0p6phVVqszmbYK9Rd0=";
+ cargoSha256 = "sha256-MAZhrd9CtFOIAaUUbXplBo+eo6Zaws2LIRkPoX4HztE=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = if stdenv.isDarwin
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index b3af90c2a38e..2bd780548114 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
- version = "6.3.0";
+ version = "6.3.1";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
- sha256 = "sha256-iAOZtVSh3mQQFs5fNbiEDXXxjWh7mrHDWNrAWK1m5pg=";
+ sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI=";
};
format = "other";
@@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
- sha256 = "sha256-VfIZ1bV8bhjjBL4KNjToPuu8gg9TkChziH2rRKhdRXE=";
+ sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@@ -157,9 +157,9 @@ let
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
- # Test broken with recent versions of git due to default policy change
- # https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/302
- test-convert-git.t
+ # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3.
+ # https://bz.mercurial-scm.org/show_bug.cgi?id=6760
+ test-https.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index cf307f0da34e..117212813594 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,32 +1,41 @@
-{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript, xlibsWrapper
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype
, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
-, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
+, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip
+, withWebKit ? false
}:
mkDerivation rec {
pname = "mythtv";
- version = "31.0";
+ version = "32.0";
src = fetchFromGitHub {
owner = "MythTV";
repo = "mythtv";
rev = "v${version}";
- sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5";
+ sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1";
};
patches = [
- # Disables OS detection used while checking if enforce_wshadow should be disabled.
- ./disable-os-detection.patch
+ # Disable sourcing /etc/os-release
+ ./dont-source-os-release.patch
+
+ # Fix QMake variable substitution syntax - MythTV/mythtv#550
+ (fetchpatch {
+ name = "fix-qmake-var-syntax.patch";
+ url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch";
+ stripLen = 1;
+ hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM=";
+ })
];
setSourceRoot = "sourceRoot=$(echo */mythtv)";
buildInputs = [
- freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
+ freetype qtbase qtscript lame zlib xlibsWrapper libGLU libGL
perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
- libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
- ];
+ libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip
+ ] ++ lib.optional withWebKit qtwebkit;
nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ];
configureFlags =
diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch
deleted file mode 100644
index 09ce6f6ca4f8..000000000000
--- a/pkgs/applications/video/mythtv/disable-os-detection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure 2020-07-21 20:50:58.653989766 +0200
-+++ b/configure 2020-07-21 20:52:21.236610586 +0200
-@@ -6537,17 +6537,17 @@
- }
-
- enable enforce_wshadow
--case $target_os in
-- android)
-- disable enforce_wshadow
-- ;;
-- linux)
-- . /etc/os-release
-- if test $ID = "centos"; then
-- disable enforce_wshadow
-- fi
-- ;;
--esac
-+#case $target_os in
-+# android)
-+# disable enforce_wshadow
-+# ;;
-+# linux)
-+# . /etc/os-release
-+# if test $ID = "centos"; then
-+# disable enforce_wshadow
-+# fi
-+# ;;
-+#esac
-
- if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
- enable qtwebkit
diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/applications/video/mythtv/dont-source-os-release.patch
new file mode 100644
index 000000000000..fb4dc686af6a
--- /dev/null
+++ b/pkgs/applications/video/mythtv/dont-source-os-release.patch
@@ -0,0 +1,15 @@
+--- a/configure
++++ b/configure
+@@ -5894,9 +5894,9 @@ else
+ die "ERROR: cannot find soundtouch 1.8.0 or later."
+ fi
+
+-if [ $target_os = "linux" ] ; then
+- . /etc/os-release
+-fi
++# if [ $target_os = "linux" ] ; then
++# . /etc/os-release
++# fi
+
+ # libudfread
+ if enabled system_libudfread ; then
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 412f55402276..30a7a52266f3 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.12.2";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-QyxWoq3hGFLm27tba5BL3xcnNCOAmY+rbGBtwREZPJA=";
+ sha256 = "sha256-m0lDnVu6T8P1di8DeQYAKBA6Y+4iSqmc0nE3iBHY5+M=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
- vendorSha256 = "sha256-QlzneikTMBUpKJiyVrN+A6CctsVvdoTOOMDjJqIF3a8=";
+ vendorSha256 = "sha256-xigDihg2SvvcFSrKYlo5VluqhqK9xzWVbrsBvsJsLXA=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix
index 198a2a0b71a5..abb8770297e6 100644
--- a/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4=";
+ sha256 = "sha256-c1AqqbeBKXfXUKgalbo5OXc0oVyQyntqwmpB0AFlwRs=";
};
- cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A=";
+ cargoSha256 = "sha256-SybFjc1oyfJpen+KH2xj/u3i1S5SLiprwkUPp9IpMfc=";
# skip test due FHS dependency
doCheck = false;
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index 86329782255d..384b806ce2f7 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "picom";
- version = "10";
+ version = "10.1";
src = fetchFromGitHub {
owner = "yshui";
repo = "picom";
rev = "v${version}";
- sha256 = "sha256-ACQBgAYtJ4OOQIismNYJB3z426GmlyUtXXbH06eRsgg=";
+ hash = "sha256-EYNLLAz7CkbVGv2XMT+73RR58HzxG+Gy7b5x1qahAgo=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index 970fdfe371fe..30e43fa0c902 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -5,24 +5,15 @@
stdenv.mkDerivation rec {
pname = "swaylock";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swaylock";
rev = version;
- sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
+ hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE=";
};
- patches = [
- # remove once when updating to 1.7
- # https://github.com/swaywm/swaylock/pull/235
- (fetchpatch {
- url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff";
- sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ=";
- })
- ];
-
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 6d4dbfbe421b..bcda40c800fa 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -61,6 +61,14 @@ rec {
(args // {
inherit name extraPkgs;
src = extract { inherit name src; };
+
+ # passthru src to make nix-update work
+ # hack to keep the origin position (unsafeGetAttrPos)
+ passthru = lib.pipe args [
+ lib.attrNames
+ (lib.remove "src")
+ (removeAttrs args)
+ ] // args.passthru or { };
});
defaultFhsEnvArgs = {
@@ -71,7 +79,6 @@ rec {
gtk3
bashInteractive
gnome.zenity
- python2
xorg.xrandr
which
perl
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 9a0d01acaae8..c6ab4589aefa 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -19,7 +19,6 @@
, pigz
, rsync
, runCommand
-, runCommandNoCC
, runtimeShell
, shadow
, skopeo
diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix
index fc7fb25e158f..e348d77db0bd 100644
--- a/pkgs/build-support/fetchurl/tests.nix
+++ b/pkgs/build-support/fetchurl/tests.nix
@@ -1,8 +1,8 @@
-{ invalidateFetcherByDrvHash, fetchurl, jq, moreutils, ... }: {
+{ testers, fetchurl, jq, moreutils, ... }: {
# Tests that we can send custom headers with spaces in them
header =
let headerValue = "Test '\" <- These are some quotes";
- in invalidateFetcherByDrvHash fetchurl {
+ in testers.invalidateFetcherByDrvHash fetchurl {
url = "https://httpbin.org/headers";
sha256 = builtins.hashString "sha256" (headerValue + "\n");
curlOptsList = [ "-H" "Hello: ${headerValue}" ];
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix
index 9c03bbb162f5..4b0f780a38b5 100644
--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -1,22 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, fontforge }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, fontforge }:
stdenv.mkDerivation rec {
pname = "tlwg";
- version = "0.6.4";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "tlwg";
repo = "fonts-tlwg";
rev = "v${version}";
- sha256 = "13bx98ygyyizb15ybdv3856lkxhx1fss8f7aiqmp0lk9zgw4mqyk";
+ sha256 = "hWiH5KJnYTdcrm+Kzn9HUQry8ry3SKzjA6/0536kCLQ=";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook autoconf-archive ];
buildInputs = [ fontforge ];
- preAutoreconf = "echo ${version} > VERSION";
-
meta = with lib; {
description = "A collection of Thai scalable fonts available under free licenses";
homepage = "https://linux.thai.net/projects/fonts-tlwg";
diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix
index 7f7dc0d043f3..cb55697fa50b 100644
--- a/pkgs/data/icons/tela-circle-icon-theme/default.nix
+++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix
@@ -2,7 +2,7 @@
, stdenvNoCC
, fetchFromGitHub
, adwaita-icon-theme
-, breeze-icons
+, libsForQt5
, gtk3
, hicolor-icon-theme
, jdupes
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec {
propagatedBuildInputs = [
adwaita-icon-theme
- breeze-icons
+ libsForQt5.breeze-icons
hicolor-icon-theme
];
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index 66eb722ad91a..a92bfec486c1 100644
--- a/pkgs/data/misc/v2ray-geoip/default.nix
+++ b/pkgs/data/misc/v2ray-geoip/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
- version = "202211170054";
+ version = "202211240054";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "e01c82114de0b2f3a2e8c80c78fc22e8fb71f68a";
- sha256 = "sha256-T94G1s3vTkh0pd2ByOpOwJDPn7geaHbnBB7w1K9qwps=";
+ rev = "1887d855ed4b4b92999d3afecf71f43358029369";
+ sha256 = "sha256-WozqLA/akUF7T0LyR/nQkTxuZPNCpYarOQG5zQwGAMk=";
};
installPhase = ''
diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix
index 9e4675bfbbd8..6c62b02ed197 100644
--- a/pkgs/development/compilers/llvm/rocm/llvm.nix
+++ b/pkgs/development/compilers/llvm/rocm/llvm.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
"-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}"
- "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt"
+ "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt;clang-tools-extra"
]
++ lib.optionals enableManpages [
"-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 0d076f0cfae3..955635d3f84c 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "rgbds";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "gbdev";
repo = "rgbds";
rev = "v${version}";
- sha256 = "sha256-/GjxdB3Nt+XuKKQWjU12mS91U4FFoeP+9t0L+HsB/o8=";
+ sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18=";
};
nativeBuildInputs = [ bison flex pkg-config ];
buildInputs = [ libpng ];
diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix
index 3012158a1c6e..3f05a546e23b 100644
--- a/pkgs/development/interpreters/php/8.0.nix
+++ b/pkgs/development/interpreters/php/8.0.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.0.25";
- hash = "sha256-CdcWvOtbPbdtkCOxDBaB674EDlH0wY39Nfn/i3O7z4w=";
+ version = "8.0.26";
+ hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc=";
});
in
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index 4b98f318062a..dc1b8c8581ef 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.12";
- hash = "sha256-+H1z6Rf6z3jee83lP8L6pNTb4Eh6lAbhq2jIro8z6wM=";
+ version = "8.1.13";
+ hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o=";
});
in
diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 72816da1d4b1..6ea49852a40e 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -1,13 +1,13 @@
{ callPackage, lib, stdenv, fetchurl, ... }@_args:
let
- hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y=";
+ hash = "sha256-MSBENMUl+F5k9manZvYjRDY3YWsYToZSQU9hmhJ8Xvc=";
base = callPackage ./generic.nix (_args // {
version = "8.2.0";
phpAttrsOverrides = attrs: attrs // {
src = fetchurl {
- url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz";
+ url = "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz";
inherit hash;
};
};
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 414634f07070..9822640f8d67 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
+{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "lvtk";
@@ -11,14 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw=";
};
- nativeBuildInputs = [ pkg-config python2 wafHook ];
+ nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [ boost gtkmm2 lv2 ];
enableParallelBuilding = true;
- # Fix including the boost libraries during linking
postPatch = ''
+ # Fix including the boost libraries during linking
sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
+
+ # don't use bundled waf
+ rm waf
+
+ # remove (useless) python2 based print
+ sed -e '/print/d' -i wscript
'';
wafConfigureFlags = [
diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix
index de4aaf32d980..3df87efba19d 100644
--- a/pkgs/development/libraries/drogon/default.nix
+++ b/pkgs/development/libraries/drogon/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "drogon";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${version}";
- sha256 = "sha256-XzSJABYuZaYlNL12bi0ykQ1OyNsvB1AQiSTBPWiTNYU=";
+ sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index e4c6d4b013c6..b9fd88d86561 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -154,7 +154,7 @@
* Darwin frameworks
*/
, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox
-, VideoDecodeAcceleration
+, VideoDecodeAcceleration, VideoToolbox
}:
/* Maintainer notes:
@@ -454,7 +454,7 @@ stdenv.mkDerivation rec {
++ optional (nvdec || nvenc) nv-codec-headers
++ optional cuda-llvm clang
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
- MediaToolbox VideoDecodeAcceleration
+ MediaToolbox VideoDecodeAcceleration VideoToolbox
libiconv ];
buildFlags = [ "all" ]
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 540fe842c5a7..8b15bbf608d5 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
mesonFlags = [
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
- ] ++ lib.optionals (!stdenv.isLinux) [
+ ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [
"-Dprofiler=disabled"
];
@@ -88,6 +88,9 @@ in stdenv.mkDerivation rec {
postPatch = ''
patchShebangs build/choose-tests-locale.sh
substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ substituteInPlace installed-tests/js/meson.build \
+ --replace "'Encoding'," "#'Encoding',"
'';
preCheck = ''
diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix
index ce2361509ce8..4eec6f354b2a 100644
--- a/pkgs/development/libraries/hipsparse/default.nix
+++ b/pkgs/development/libraries/hipsparse/default.nix
@@ -11,22 +11,14 @@
, hip
, gfortran
, git
-, fetchzip ? null
, gtest ? null
, buildTests ? false
}:
-assert buildTests -> fetchzip != null;
assert buildTests -> gtest != null;
# This can also use cuSPARSE as a backend instead of rocSPARSE
-let
- matrices = lib.optionalAttrs buildTests import ./deps.nix {
- inherit fetchzip;
- mirror1 = "https://sparse.tamu.edu/MM";
- mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
- };
-in stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
pname = "hipsparse";
repoVersion = "2.3.1";
rocmVersion = "5.3.3";
@@ -81,25 +73,25 @@ in stdenv.mkDerivation (finalAttrs: {
'' + lib.optionalString buildTests ''
mkdir -p matrices
- ln -s ${matrices.matrix-01}/*.mtx matrices
- ln -s ${matrices.matrix-02}/*.mtx matrices
- ln -s ${matrices.matrix-03}/*.mtx matrices
- ln -s ${matrices.matrix-04}/*.mtx matrices
- ln -s ${matrices.matrix-05}/*.mtx matrices
- ln -s ${matrices.matrix-06}/*.mtx matrices
- ln -s ${matrices.matrix-07}/*.mtx matrices
- ln -s ${matrices.matrix-08}/*.mtx matrices
- ln -s ${matrices.matrix-09}/*.mtx matrices
- ln -s ${matrices.matrix-10}/*.mtx matrices
- ln -s ${matrices.matrix-11}/*.mtx matrices
- ln -s ${matrices.matrix-12}/*.mtx matrices
- ln -s ${matrices.matrix-13}/*.mtx matrices
- ln -s ${matrices.matrix-14}/*.mtx matrices
- ln -s ${matrices.matrix-15}/*.mtx matrices
- ln -s ${matrices.matrix-16}/*.mtx matrices
- ln -s ${matrices.matrix-17}/*.mtx matrices
- ln -s ${matrices.matrix-18}/*.mtx matrices
- ln -s ${matrices.matrix-19}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-01}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-02}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-03}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-04}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-05}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-06}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-07}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-08}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-09}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-10}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-11}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-12}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-13}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-14}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-15}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-16}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-17}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-18}/*.mtx matrices
+ ln -s ${rocsparse.passthru.matrices.matrix-19}/*.mtx matrices
# Not used by the original cmake, causes an error
rm matrices/*_b.mtx
diff --git a/pkgs/development/libraries/hipsparse/deps.nix b/pkgs/development/libraries/hipsparse/deps.nix
deleted file mode 100644
index d70df67e2b78..000000000000
--- a/pkgs/development/libraries/hipsparse/deps.nix
+++ /dev/null
@@ -1,177 +0,0 @@
-{ fetchzip
-, mirror1
-, mirror2
-}:
-
-{
- matrix-01 = fetchzip {
- sha256 = "sha256-AHur5ZIDZTFRrO2GV0ieXrffq4KUiGWiZ59pv0fUtEQ=";
-
- urls = [
- "${mirror1}/SNAP/amazon0312.tar.gz"
- "${mirror2}/SNAP/amazon0312.tar.gz"
- ];
- };
-
- matrix-02 = fetchzip {
- sha256 = "sha256-0rSxaN4lQcdaCLsvlgicG70FXUxXeERPiEmQ4MzbRdE=";
-
- urls = [
- "${mirror1}/Muite/Chebyshev4.tar.gz"
- "${mirror2}/Muite/Chebyshev4.tar.gz"
- ];
- };
-
- matrix-03 = fetchzip {
- sha256 = "sha256-hDzDWDUnHEyFedX/tMNq83ZH8uWyM4xtZYUUAD3rizo=";
-
- urls = [
- "${mirror1}/FEMLAB/sme3Dc.tar.gz"
- "${mirror2}/FEMLAB/sme3Dc.tar.gz"
- ];
- };
-
- matrix-04 = fetchzip {
- sha256 = "sha256-GmN2yOt/MoX01rKe05aTyB3ypUP4YbQGOITZ0BqPmC0=";
-
- urls = [
- "${mirror1}/Williams/webbase-1M.tar.gz"
- "${mirror2}/Williams/webbase-1M.tar.gz"
- ];
- };
-
- matrix-05 = fetchzip {
- sha256 = "sha256-gQNjfVyWzNM9RwImJGhkhahRmZz74LzDs1oijL7mI7k=";
-
- urls = [
- "${mirror1}/Williams/mac_econ_fwd500.tar.gz"
- "${mirror2}/Williams/mac_econ_fwd500.tar.gz"
- ];
- };
-
- matrix-06 = fetchzip {
- sha256 = "sha256-87cdZjntNcTuz5BtO59irhcuRbPllWSbhCEX3Td02qc=";
-
- urls = [
- "${mirror1}/Williams/mc2depi.tar.gz"
- "${mirror2}/Williams/mc2depi.tar.gz"
- ];
- };
-
- matrix-07 = fetchzip {
- sha256 = "sha256-WRamuJX3D8Tm+k0q67RjUDG3DeNAxhKiaPkk5afY5eU=";
-
- urls = [
- "${mirror1}/Bova/rma10.tar.gz"
- "${mirror2}/Bova/rma10.tar.gz"
- ];
- };
-
- matrix-08 = fetchzip {
- sha256 = "sha256-5dhkm293Mc3lzakKxHy5W5XIn4Rw+gihVh7gyrjEHXo=";
-
- urls = [
- "${mirror1}/JGD_BIBD/bibd_22_8.tar.gz"
- "${mirror2}/JGD_BIBD/bibd_22_8.tar.gz"
- ];
- };
-
- matrix-09 = fetchzip {
- sha256 = "sha256-czjLWCjXAjZCk5TGYHaEkwSAzQu3TQ3QyB6eNKR4G88=";
-
- urls = [
- "${mirror1}/Hamm/scircuit.tar.gz"
- "${mirror2}/Hamm/scircuit.tar.gz"
- ];
- };
-
- matrix-10 = fetchzip {
- sha256 = "sha256-bYuLnJViAIcIejAkh69/bsNAVIDU4wfTLtD+nmHd6FM=";
-
- urls = [
- "${mirror1}/Sandia/ASIC_320k.tar.gz"
- "${mirror2}/Sandia/ASIC_320k.tar.gz"
- ];
- };
-
- matrix-11 = fetchzip {
- sha256 = "sha256-aDwn8P1khYjo2Agbq5m9ZBInJUxf/knJNvyptt0fak0=";
-
- urls = [
- "${mirror1}/GHS_psdef/bmwcra_1.tar.gz"
- "${mirror2}/GHS_psdef/bmwcra_1.tar.gz"
- ];
- };
-
- matrix-12 = fetchzip {
- sha256 = "sha256-8OJqA/byhlAZd869TPUzZFdsOiwOoRGfKyhM+RMjXoY=";
-
- urls = [
- "${mirror1}/HB/nos1.tar.gz"
- "${mirror2}/HB/nos1.tar.gz"
- ];
- };
-
- matrix-13 = fetchzip {
- sha256 = "sha256-FS0rKqmg+uHwsM/yGfQLBdd7LH/rUrdutkNGBD/Mh1I=";
-
- urls = [
- "${mirror1}/HB/nos2.tar.gz"
- "${mirror2}/HB/nos2.tar.gz"
- ];
- };
-
- matrix-14 = fetchzip {
- sha256 = "sha256-DANnlrNJikrI7Pst9vRedtbuxepyHmCIu2yhltc4Qcs=";
-
- urls = [
- "${mirror1}/HB/nos3.tar.gz"
- "${mirror2}/HB/nos3.tar.gz"
- ];
- };
-
- matrix-15 = fetchzip {
- sha256 = "sha256-21mUgqjWGUfYgiWwSrKh9vH8Vdt3xzcefmqYNYRpxiY=";
-
- urls = [
- "${mirror1}/HB/nos4.tar.gz"
- "${mirror2}/HB/nos4.tar.gz"
- ];
- };
-
- matrix-16 = fetchzip {
- sha256 = "sha256-FOuXvGqBBFNkVS6cexmkluret54hCfCOdK+DOZllE4c=";
-
- urls = [
- "${mirror1}/HB/nos5.tar.gz"
- "${mirror2}/HB/nos5.tar.gz"
- ];
- };
-
- matrix-17 = fetchzip {
- sha256 = "sha256-+7NI1rA/qQxYPpjXKHvAaCZ+LSaAJ4xuJvMRMBEUYxg=";
-
- urls = [
- "${mirror1}/HB/nos6.tar.gz"
- "${mirror2}/HB/nos6.tar.gz"
- ];
- };
-
- matrix-18 = fetchzip {
- sha256 = "sha256-q3NxJjbwGGcFiQ9nhWfUKgZmdVwCfPmgQoqy0AqOsNc=";
-
- urls = [
- "${mirror1}/HB/nos7.tar.gz"
- "${mirror2}/HB/nos7.tar.gz"
- ];
- };
-
- matrix-19 = fetchzip {
- sha256 = "sha256-0GAN6qmVfD+tprIigzuUUUwm5KVhkN9X65wMEvFltDY=";
-
- urls = [
- "${mirror1}/DNVS/shipsec1.tar.gz"
- "${mirror2}/DNVS/shipsec1.tar.gz"
- ];
- };
-}
diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix
index 84803159a2b3..66be524a86ca 100644
--- a/pkgs/development/libraries/hotpatch/default.nix
+++ b/pkgs/development/libraries/hotpatch/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH=$(pwd)/src make test
'';
+ patches = [ ./no-loader-test.patch ];
+
meta = with lib; {
description = "Hot patching executables on Linux using .so file injection";
homepage = src.meta.homepage;
diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/development/libraries/hotpatch/no-loader-test.patch
new file mode 100644
index 000000000000..5bc975bb848a
--- /dev/null
+++ b/pkgs/development/libraries/hotpatch/no-loader-test.patch
@@ -0,0 +1,25 @@
+diff --git a/test/loader.c b/test/loader.c
+index 4e3dfdc..7f98d94 100644
+--- a/test/loader.c
++++ b/test/loader.c
+@@ -54,20 +54,6 @@ int main(int argc, char **argv)
+ assert(ret < 0);
+ ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6);
+ assert(ret >= 0);
+-#if __WORDSIZE == 64
+- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2",
+- true, NULL, 6);
+- assert(ret >= 0);
+- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2",
+- false, NULL, 6);
+-#else
+- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2",
+- true, NULL, 6);
+- assert(ret >= 0);
+- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2",
+- false, NULL, 6);
+-#endif
+- assert(ret < 0);
+ ld_free_maps(maps, mapnum);
+ return 0;
+ }
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix
index 0a121d923146..053d06f34a6e 100644
--- a/pkgs/development/libraries/java/commons/bcel/default.nix
+++ b/pkgs/development/libraries/java/commons/bcel/default.nix
@@ -1,18 +1,18 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "5.2";
+ version = "6.6.1";
pname = "commons-bcel";
src = fetchurl {
- url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz";
- sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6";
+ url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz";
+ sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4=";
};
installPhase = ''
tar xf ${src}
mkdir -p $out/share/java
- cp bcel-5.2.jar $out/share/java/
+ cp bcel-${version}.jar $out/share/java/
'';
meta = {
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index 546573c62306..324f0669af31 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
})
+ ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+ (fetchpatch {
+ name = "musl-realpath-test.patch";
+ url = "https://git.alpinelinux.org/aports/plain/community/libcdio/disable-broken-test.patch?id=058a8695c12ae13b40c981ee98809352490b6155";
+ includes = [ "test/driver/realpath.c" ];
+ sha256 = "sha256-6j2bjMed2l+TFZ5emjCcozzF/kkGA8FVifJB8U7QceU=";
+ })
];
postPatch = ''
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index f2671e0dc76b..23f2a1d0d723 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
- version = "1.101.0";
+ version = "1.102.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
- hash = "sha256-EhFxun80s5tNZT4d7vbszTfHbYK9X3PohsQl20wRzlg=";
+ hash = "sha256-xw/lUNs39nkBrydpcgUBL3j6XrZFafKslxx6zUiElWw=";
};
patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-8uu4i4WfW9pmdLAWWUU1QP09B1/ws+DeVf8baYfikw4=";
+ hash = "sha256-CiqYKFABHcFSjYUH/qop1xWCoygQJajI7nhv04ElD10=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 886caaada47b..bec3bba51e6e 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }:
stdenv.mkDerivation rec {
pname = "libeatmydata";
@@ -11,7 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r";
};
- patches = [ ./find-shell-lib.patch ];
+ patches = [
+ ./find-shell-lib.patch
+
+ # Fixes "error: redefinition of 'open'" on musl
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch";
+ stripLen = 1;
+ sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo=";
+ })
+ ];
patchFlags = [ "-p0" ];
diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix
new file mode 100644
index 000000000000..f50a462e62a6
--- /dev/null
+++ b/pkgs/development/libraries/miopen/default.nix
@@ -0,0 +1,215 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, writeScript
+, pkg-config
+, cmake
+, rocm-cmake
+, rocm-runtime
+, rocm-device-libs
+, rocm-comgr
+, rocm-opencl-runtime
+, rocblas
+, rocmlir
+, hip
+, clang
+, clang-ocl
+, llvm
+, miopengemm
+, composable_kernel
+, half
+, boost
+, sqlite
+, bzip2
+, texlive ? null
+, doxygen ? null
+, sphinx ? null
+, python3Packages ? null
+, zlib ? null
+, fetchurl ? null
+, buildDocs ? false
+, buildTests ? false
+# LFS isn't working, so we will manually fetch these
+# This isn't strictly required, but is recommended
+# https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1373
+, fetchKDBs ? true
+, useOpenCL ? false
+}:
+
+assert buildDocs -> texlive != null;
+assert buildDocs -> doxygen != null;
+assert buildDocs -> sphinx != null;
+assert buildDocs -> python3Packages != null;
+assert buildTests -> zlib != null;
+assert fetchKDBs -> fetchurl != null;
+
+let
+ latex = lib.optionalAttrs buildDocs (texlive.combine {
+ inherit (texlive) scheme-small
+ latexmk
+ tex-gyre
+ fncychap
+ wrapfig
+ capt-of
+ framed
+ needspace
+ tabulary
+ varwidth
+ titlesec;
+ });
+
+ kdbs = lib.optionalAttrs fetchKDBs import ./deps.nix {
+ inherit fetchurl;
+ mirror = "https://repo.radeon.com/rocm/miopen-kernel/rel-5.0";
+ };
+in stdenv.mkDerivation (finalAttrs: {
+ pname = "miopen";
+ # We have to manually specify the repoVersion for now
+ # Find the github release or `-- MIOpen_VERSION= X.X.X` in the build log
+ repoVersion = "2.18.0";
+ rocmVersion = "5.3.3";
+ version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
+
+ outputs = [
+ "out"
+ ] ++ lib.optionals buildDocs [
+ "doc"
+ ] ++ lib.optionals buildTests [
+ "test"
+ ];
+
+ src = fetchFromGitHub {
+ owner = "ROCmSoftwarePlatform";
+ repo = "MIOpen";
+ rev = "rocm-${finalAttrs.rocmVersion}";
+ hash = "sha256-5/JitdGJ0afzK4pGOOywRLsB3/Thc6/71sRkKIxf2Lg=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ cmake
+ rocm-cmake
+ hip
+ clang
+ llvm
+ ];
+
+ buildInputs = [
+ rocm-runtime
+ rocm-device-libs
+ rocm-comgr
+ rocm-opencl-runtime
+ rocblas
+ rocmlir
+ clang-ocl
+ miopengemm
+ composable_kernel
+ half
+ boost
+ sqlite
+ bzip2
+ ] ++ lib.optionals buildDocs [
+ latex
+ doxygen
+ sphinx
+ python3Packages.sphinx_rtd_theme
+ python3Packages.breathe
+ python3Packages.myst-parser
+ ] ++ lib.optionals buildTests [
+ zlib
+ ];
+
+ cmakeFlags = [
+ "-DMIOPEN_USE_MIOPENGEMM=ON"
+ # Manually define CMAKE_INSTALL_
+ # See: https://github.com/NixOS/nixpkgs/pull/197838
+ "-DCMAKE_INSTALL_BINDIR=bin"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ ] ++ lib.optionals (!useOpenCL) [
+ "-DCMAKE_C_COMPILER=hipcc"
+ "-DCMAKE_CXX_COMPILER=hipcc"
+ "-DMIOPEN_BACKEND=HIP"
+ ] ++ lib.optionals useOpenCL [
+ "-DCMAKE_C_COMPILER=${clang}/bin/clang"
+ "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++"
+ "-DMIOPEN_BACKEND=OpenCL"
+ ] ++ lib.optionals buildTests [
+ "-DBUILD_TESTS=ON"
+ "-DMIOPEN_TEST_ALL=ON"
+ "-DMIOPEN_TEST_GFX900=ON"
+ "-DMIOPEN_TEST_GFX906=ON"
+ "-DMIOPEN_TEST_GFX908=ON"
+ "-DMIOPEN_TEST_GFX90A=ON"
+ "-DMIOPEN_TEST_GFX103X=ON"
+ ];
+
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "enable_testing()" "" \
+ --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \
+ --replace "/opt/rocm/hip" "${hip}" \
+ --replace "/opt/rocm/llvm" "${llvm}" \
+ --replace "3 REQUIRED PATHS /opt/rocm)" "3 REQUIRED PATHS ${hip})" \
+ --replace "hip REQUIRED PATHS /opt/rocm" "hip REQUIRED PATHS ${hip}" \
+ --replace "rocblas REQUIRED PATHS /opt/rocm" "rocblas REQUIRED PATHS ${rocblas}" \
+ --replace "miopengemm PATHS /opt/rocm" "miopengemm PATHS ${miopengemm}" \
+ --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # Fix clang-tidy at some point
+ '' + lib.optionalString (!buildTests) ''
+ substituteInPlace CMakeLists.txt \
+ --replace "add_subdirectory(test)" ""
+ '' + lib.optionalString fetchKDBs ''
+ cp -a ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb
+ cp -a ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb
+ cp -a ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb
+ cp -a ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb
+ cp -a ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb
+ cp -a ${kdbs.gfx90878} src/kernels/gfx90878.kdb
+ cp -a ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb
+ cp -a ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb
+ '';
+
+ # Unfortunately, it seems like we have to call make on these manually
+ postBuild = lib.optionalString buildDocs ''
+ export HOME=$(mktemp -d)
+ make doc
+ '' + lib.optionalString buildTests ''
+ make -j$NIX_BUILD_CORES check
+ '';
+
+ postInstall = ''
+ rm $out/bin/install_precompiled_kernels.sh
+ '' + lib.optionalString buildTests ''
+ mkdir -p $test/bin
+ mv bin/test_* $test/bin
+ patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.nativeBuildInputs ++ finalAttrs.buildInputs)}:$out/lib $test/bin/*
+ '';
+
+ postFixup = lib.optionalString (buildDocs && !useOpenCL) ''
+ export docDir=$doc/share/doc/miopen-hip
+ '' + lib.optionalString (buildDocs && useOpenCL) ''
+ export docDir=$doc/share/doc/miopen-opencl
+ '' + lib.optionalString buildDocs ''
+ mkdir -p $docDir
+ mv ../doc/html $docDir
+ mv ../doc/pdf/miopen.pdf $docDir
+ '';
+
+ passthru.updateScript = writeScript "update.sh" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl jq common-updater-scripts
+ rocmVersion="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/MIOpen/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
+ update-source-version miopen "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
+ '';
+
+ meta = with lib; {
+ description = "Machine intelligence library for ROCm";
+ homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen";
+ license = with licenses; [ mit ];
+ maintainers = teams.rocm.members;
+ broken = finalAttrs.rocmVersion != hip.version;
+ # MIOpen will produce a very large output due to KDBs fetched
+ # Also possibly in the future because of KDB generation
+ hydraPlatforms = [ ];
+ };
+})
diff --git a/pkgs/development/libraries/miopen/deps.nix b/pkgs/development/libraries/miopen/deps.nix
new file mode 100644
index 000000000000..e88b61ad974c
--- /dev/null
+++ b/pkgs/development/libraries/miopen/deps.nix
@@ -0,0 +1,45 @@
+{ fetchurl
+, mirror
+}:
+
+{
+ gfx1030_36 = fetchurl {
+ sha256 = "sha256-zEXDLkRWAHS15LDA5IRyqG5rO7HHPBiVgPlQ8JjSqNc=";
+ url = "${mirror}/gfx1030_36.kdb";
+ };
+
+ gfx900_56 = fetchurl {
+ sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI=";
+ url = "${mirror}/gfx900_56.kdb";
+ };
+
+ gfx900_64 = fetchurl {
+ sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI=";
+ url = "${mirror}/gfx900_64.kdb";
+ };
+
+ gfx906_60 = fetchurl {
+ sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4=";
+ url = "${mirror}/gfx906_60.kdb";
+ };
+
+ gfx906_64 = fetchurl {
+ sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4=";
+ url = "${mirror}/gfx906_64.kdb";
+ };
+
+ gfx90878 = fetchurl {
+ sha256 = "sha256-r7DRhNH+jHUXAu64b9vWsZzGD4w5oSHnxH0l2RN0qlQ=";
+ url = "${mirror}/gfx90878.kdb";
+ };
+
+ gfx90a68 = fetchurl {
+ sha256 = "sha256-NT//zIPTbzsPJyaVycxwU6BcMTzGc/d+Z4Ab9FImDko=";
+ url = "${mirror}/gfx90a68.kdb";
+ };
+
+ gfx90a6e = fetchurl {
+ sha256 = "sha256-ENZHbf+/MGYgSTpALKh2meuZPNhH5bG+WrW/jzvGpBs=";
+ url = "${mirror}/gfx90a6e.kdb";
+ };
+}
diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix
new file mode 100644
index 000000000000..cc3dbebd224b
--- /dev/null
+++ b/pkgs/development/libraries/rocrand/default.nix
@@ -0,0 +1,100 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, writeScript
+, cmake
+, rocm-cmake
+, rocm-runtime
+, rocm-device-libs
+, rocm-comgr
+, hip
+, gtest ? null
+, gbenchmark ? null
+, buildTests ? false
+, buildBenchmarks ? false
+}:
+
+assert buildTests -> gtest != null;
+assert buildBenchmarks -> gbenchmark != null;
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "rocrand";
+ repoVersion = "2.10.15";
+ rocmVersion = "5.3.3";
+ version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
+
+ outputs = [
+ "out"
+ ] ++ lib.optionals buildTests [
+ "test"
+ ] ++ lib.optionals buildBenchmarks [
+ "benchmark"
+ ];
+
+ src = fetchFromGitHub {
+ owner = "ROCmSoftwarePlatform";
+ repo = "rocRAND";
+ rev = "rocm-${finalAttrs.rocmVersion}";
+ hash = "sha256-awQLqPmhVxegrqqSoC8fiCQJ33bPKZlljSAXnHVcIZo=";
+ fetchSubmodules = true; # For inline hipRAND
+ };
+
+ nativeBuildInputs = [
+ cmake
+ rocm-cmake
+ hip
+ ];
+
+ buildInputs = [
+ rocm-runtime
+ rocm-device-libs
+ rocm-comgr
+ ] ++ lib.optionals buildTests [
+ gtest
+ ] ++ lib.optionals buildBenchmarks [
+ gbenchmark
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_C_COMPILER=hipcc"
+ "-DCMAKE_CXX_COMPILER=hipcc"
+ "-DHIP_ROOT_DIR=${hip}"
+ # Manually define CMAKE_INSTALL_
+ # See: https://github.com/NixOS/nixpkgs/pull/197838
+ "-DCMAKE_INSTALL_BINDIR=bin"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ ] ++ lib.optionals buildTests [
+ "-DBUILD_TEST=ON"
+ ] ++ lib.optionals buildBenchmarks [
+ "-DBUILD_BENCHMARK=ON"
+ ];
+
+ postInstall = lib.optionalString buildTests ''
+ mkdir -p $test/bin
+ mv $out/bin/test_* $test/bin
+ '' + lib.optionalString buildBenchmarks ''
+ mkdir -p $benchmark/bin
+ mv $out/bin/benchmark_* $benchmark/bin
+ '' + lib.optionalString (buildTests || buildBenchmarks) ''
+ rmdir $out/bin
+ '';
+
+ passthru.updateScript = writeScript "update.sh" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl jq common-updater-scripts
+ json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocRAND/releases?per_page=1")"
+ repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
+ rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
+ update-source-version rocrand "$repoVersion" --ignore-same-hash --version-key=repoVersion
+ update-source-version rocrand "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
+ '';
+
+ meta = with lib; {
+ description = "Generate pseudo-random and quasi-random numbers";
+ homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND";
+ license = with licenses; [ mit ];
+ maintainers = teams.rocm.members;
+ broken = finalAttrs.rocmVersion != hip.version;
+ };
+})
diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix
index f8d3324f1d74..0f0ce977b1d2 100644
--- a/pkgs/development/libraries/rocsparse/default.nix
+++ b/pkgs/development/libraries/rocsparse/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchzip
, writeScript
, cmake
, rocm-cmake
@@ -11,7 +12,6 @@
, hip
, gfortran
, git
-, fetchzip ? null
, gtest ? null
, boost ? null
, python3Packages ? null
@@ -19,18 +19,11 @@
, buildBenchmarks ? false # Seems to depend on tests
}:
-assert (buildTests || buildBenchmarks) -> fetchzip != null;
assert (buildTests || buildBenchmarks) -> gtest != null;
assert (buildTests || buildBenchmarks) -> boost != null;
assert (buildTests || buildBenchmarks) -> python3Packages != null;
-let
- matrices = lib.optionalAttrs (buildTests || buildBenchmarks) import ./deps.nix {
- inherit fetchzip;
- mirror1 = "https://sparse.tamu.edu/MM";
- mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
- };
-in stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
pname = "rocsparse";
repoVersion = "2.3.2";
rocmVersion = "5.3.3";
@@ -90,30 +83,30 @@ in stdenv.mkDerivation (finalAttrs: {
postPatch = lib.optionalString (buildTests || buildBenchmarks) ''
mkdir -p matrices
- ln -s ${matrices.matrix-01}/*.mtx matrices
- ln -s ${matrices.matrix-02}/*.mtx matrices
- ln -s ${matrices.matrix-03}/*.mtx matrices
- ln -s ${matrices.matrix-04}/*.mtx matrices
- ln -s ${matrices.matrix-05}/*.mtx matrices
- ln -s ${matrices.matrix-06}/*.mtx matrices
- ln -s ${matrices.matrix-07}/*.mtx matrices
- ln -s ${matrices.matrix-08}/*.mtx matrices
- ln -s ${matrices.matrix-09}/*.mtx matrices
- ln -s ${matrices.matrix-10}/*.mtx matrices
- ln -s ${matrices.matrix-11}/*.mtx matrices
- ln -s ${matrices.matrix-12}/*.mtx matrices
- ln -s ${matrices.matrix-13}/*.mtx matrices
- ln -s ${matrices.matrix-14}/*.mtx matrices
- ln -s ${matrices.matrix-15}/*.mtx matrices
- ln -s ${matrices.matrix-16}/*.mtx matrices
- ln -s ${matrices.matrix-17}/*.mtx matrices
- ln -s ${matrices.matrix-18}/*.mtx matrices
- ln -s ${matrices.matrix-19}/*.mtx matrices
- ln -s ${matrices.matrix-20}/*.mtx matrices
- ln -s ${matrices.matrix-21}/*.mtx matrices
- ln -s ${matrices.matrix-22}/*.mtx matrices
- ln -s ${matrices.matrix-23}/*.mtx matrices
- ln -s ${matrices.matrix-24}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-01}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-02}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-03}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-04}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-05}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-06}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-07}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-08}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-09}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-10}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-11}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-12}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-13}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-14}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-15}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-16}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-17}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-18}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-19}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-20}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-21}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-22}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-23}/*.mtx matrices
+ ln -s ${finalAttrs.passthru.matrices.matrix-24}/*.mtx matrices
# Not used by the original cmake, causes an error
rm matrices/*_b.mtx
@@ -140,15 +133,23 @@ in stdenv.mkDerivation (finalAttrs: {
rmdir $out/bin
'';
- passthru.updateScript = writeScript "update.sh" ''
- #!/usr/bin/env nix-shell
- #!nix-shell -i bash -p curl jq common-updater-scripts
- json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1")"
- repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
- rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
- update-source-version rocsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
- update-source-version rocsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
- '';
+ passthru = {
+ matrices = import ./deps.nix {
+ inherit fetchzip;
+ mirror1 = "https://sparse.tamu.edu/MM";
+ mirror2 = "https://www.cise.ufl.edu/research/sparse/MM";
+ };
+
+ updateScript = writeScript "update.sh" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl jq common-updater-scripts
+ json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocSPARSE/releases?per_page=1")"
+ repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
+ rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
+ update-source-version rocsparse "$repoVersion" --ignore-same-hash --version-key=repoVersion
+ update-source-version rocsparse "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
+ '';
+ };
meta = with lib; {
description = "ROCm SPARSE implementation";
diff --git a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch
new file mode 100644
index 000000000000..7208d20a2127
--- /dev/null
+++ b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch
@@ -0,0 +1,19 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 7e0f2c8..db54eab 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -31,14 +31,6 @@ cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests"
+ cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF )
+
+ # Test/benchmark requires additional dependencies
+-include( FetchContent )
+-
+-FetchContent_Declare(
+- googletest
+- URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+-)
+-FetchContent_MakeAvailable(googletest)
+-
+ include(GoogleTest)
+
+ set(ROCWMMA_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix
new file mode 100644
index 000000000000..9091a5651819
--- /dev/null
+++ b/pkgs/development/libraries/rocwmma/default.nix
@@ -0,0 +1,157 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, writeScript
+, cmake
+, rocm-cmake
+, hip
+, openmp
+, gtest ? null
+, rocblas ? null
+, texlive ? null
+, doxygen ? null
+, sphinx ? null
+, python3Packages ? null
+, buildTests ? false
+, buildSamples ? false
+, buildDocs ? false
+, gpuTargets ? null # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ]
+}:
+
+assert buildTests -> gtest != null;
+assert buildTests -> rocblas != null;
+assert buildDocs -> texlive != null;
+assert buildDocs -> doxygen != null;
+assert buildDocs -> sphinx != null;
+assert buildDocs -> python3Packages != null;
+
+# Building tests isn't working for now
+# undefined reference to symbol '_ZTIN7testing4TestE'
+assert buildTests == false;
+
+let
+ latex = lib.optionalAttrs buildDocs (texlive.combine {
+ inherit (texlive) scheme-small
+ latexmk
+ tex-gyre
+ fncychap
+ wrapfig
+ capt-of
+ framed
+ needspace
+ tabulary
+ varwidth
+ titlesec;
+ });
+in stdenv.mkDerivation (finalAttrs: {
+ pname = "rocwmma";
+ repoVersion = "0.8";
+ rocmVersion = "5.3.3";
+ version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}";
+
+ outputs = [
+ "out"
+ ] ++ lib.optionals buildTests [
+ "test"
+ ] ++ lib.optionals buildSamples [
+ "sample"
+ ] ++ lib.optionals buildDocs [
+ "docs"
+ ];
+
+ src = fetchFromGitHub {
+ owner = "ROCmSoftwarePlatform";
+ repo = "rocWMMA";
+ rev = "rocm-${finalAttrs.rocmVersion}";
+ hash = "sha256-wU3R1XGTy7uFbceUyE0wy+XayicuyJIVfd1ih6pbTN0=";
+ };
+
+ patches = lib.optionals buildTests [
+ ./0000-dont-fetch-googletest.patch
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ rocm-cmake
+ hip
+ ];
+
+ buildInputs = [
+ openmp
+ ] ++ lib.optionals buildTests [
+ gtest
+ rocblas
+ ] ++ lib.optionals buildDocs [
+ latex
+ doxygen
+ sphinx
+ python3Packages.sphinx_rtd_theme
+ python3Packages.breathe
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_CXX_COMPILER=hipcc"
+ "-DROCWMMA_BUILD_TESTS=${if buildTests then "ON" else "OFF"}"
+ "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}"
+ # Manually define CMAKE_INSTALL_
+ # See: https://github.com/NixOS/nixpkgs/pull/197838
+ "-DCMAKE_INSTALL_BINDIR=bin"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ ] ++ lib.optionals (gpuTargets != null) [
+ "-DGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}"
+ ] ++ lib.optionals buildTests [
+ "-DROCWMMA_BUILD_VALIDATION_TESTS=ON"
+ "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON"
+ "-DROCWMMA_BUILD_EXTENDED_TESTS=ON"
+ "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON"
+ "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON"
+ ];
+
+ postPatch = lib.optionalString buildDocs ''
+ patchShebangs docs/*.sh
+ '';
+
+ # Unfortunately, it seems like we have to call make on this manually
+ # -DROCWMMA_BUILD_DOCS=ON is invalid, despite being on the README
+ postBuild = lib.optionalString buildDocs ''
+ export HOME=$(mktemp -d)
+ ../docs/run_doc.sh
+ '';
+
+ postInstall = lib.optionalString buildTests ''
+ mkdir -p $test/bin
+ mv $out/bin/*_test* $test/bin
+ '' + lib.optionalString buildSamples ''
+ mkdir -p $sample/bin
+ mv $out/bin/sgemmv $sample/bin
+ mv $out/bin/simple_gemm $sample/bin
+ mv $out/bin/simple_dlrm $sample/bin
+ '' + lib.optionalString (buildTests || buildSamples) ''
+ rmdir $out/bin
+ '';
+
+ postFixup = lib.optionalString buildDocs ''
+ mkdir -p $docs/share/doc/rocwmma
+ mv ../docs/source/_build/html $docs/share/doc/rocwmma
+ mv ../docs/source/_build/latex/rocWMMA.pdf $docs/share/doc/rocwmma
+ '';
+
+ passthru.updateScript = writeScript "update.sh" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl jq common-updater-scripts
+ json="$(curl -sL "https://api.github.com/repos/ROCmSoftwarePlatform/rocWMMA/releases?per_page=1")"
+ repoVersion="$(echo "$json" | jq '.[0].name | split(" ") | .[1]' --raw-output)"
+ rocmVersion="$(echo "$json" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)"
+ update-source-version rocwmma "$repoVersion" --ignore-same-hash --version-key=repoVersion
+ update-source-version rocwmma "$rocmVersion" --ignore-same-hash --version-key=rocmVersion
+ '';
+
+ meta = with lib; {
+ description = "Mixed precision matrix multiplication and accumulation";
+ homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA";
+ license = with licenses; [ mit ];
+ maintainers = teams.rocm.members;
+ broken = finalAttrs.rocmVersion != hip.version;
+ };
+})
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix
index 5a4e82d815fc..215b1ebc4f01 100644
--- a/pkgs/development/libraries/simdjson/default.nix
+++ b/pkgs/development/libraries/simdjson/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "simdjson";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
- sha256 = "sha256-Ub0gHxnc4ljVqbAWuFJYBuhA4FjX4ypg1gaPXUrcWkE=";
+ sha256 = "sha256-e5u9+H4rILIDpnZxzVV9wbjhR9tRqnf11i2Kn39DTzo=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/speedtest-exporter/default.nix b/pkgs/development/libraries/speedtest-exporter/default.nix
new file mode 100644
index 000000000000..51ab1ac33d03
--- /dev/null
+++ b/pkgs/development/libraries/speedtest-exporter/default.nix
@@ -0,0 +1,26 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+ pname = "speedtest-exporter";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "nlamirault";
+ repo = "speedtest_exporter";
+ rev = "v${version}";
+ hash = "sha256-WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ=";
+ };
+
+ vendorHash = "sha256-Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM=";
+
+ meta = with lib; {
+ description = "Prometheus exporter for Speedtest metrics";
+ homepage = "https://github.com/nlamirault/speedtest_exporter";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ urandom ];
+ mainProgram = "speedtest_exporter";
+ };
+}
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 2564162c3bf1..cb5065144c37 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -137,6 +137,8 @@ stdenv.mkDerivation rec {
"-Dpolkit=disabled"
] ++ lib.optionals (!stdenv.isLinux) [
"-Dlibcap-ng=disabled"
+ ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+ "-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
];
meta = with lib; {
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 5becc91699bf..c4c22170ba35 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -497,7 +497,7 @@ with prev;
# we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin
checkPhase = ''
- export LIBSQLITE="${sqlite.out}/lib/libsqlite3.so"
+ export LIBSQLITE="${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"
export HOME="$TMPDIR";
nvim --headless -i NONE \
diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index c853b1d25a35..03957073c149 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -1,23 +1,30 @@
{ lib
+, async-timeout
, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, dataclasses
-, kafka-python
, cython
+, fetchFromGitHub
+, gssapi
+, kafka-python
+, lz4
+, packaging
+, python-snappy
+, pythonOlder
, zlib
+, zstandard
}:
buildPythonPackage rec {
pname = "aiokafka";
- version = "0.7.2";
- disabled = pythonOlder "3.6";
+ version = "0.8.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-D+91k4zVg28qPbWIrvyXi6WtDs1jeJt9jFGsrSBA3cs=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-g7xUB5RfjG4G7J9Upj3KXKSePa+VDit1Zf8pWHfui1o=";
};
nativeBuildInputs = [
@@ -29,20 +36,38 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
+ async-timeout
kafka-python
- ] ++ lib.optionals (pythonOlder "3.7") [
- dataclasses
+ packaging
];
- # checks require running kafka server
+ passthru.optional-dependencies = {
+ snappy = [
+ python-snappy
+ ];
+ lz4 = [
+ lz4
+ ];
+ zstd = [
+ zstandard
+ ];
+ gssapi = [
+ gssapi
+ ];
+ };
+
+ # Checks require running Kafka server
doCheck = false;
- pythonImportsCheck = [ "aiokafka" ];
+ pythonImportsCheck = [
+ "aiokafka"
+ ];
meta = with lib; {
description = "Kafka integration with asyncio";
homepage = "https://aiokafka.readthedocs.org";
+ changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index 4aeec041c043..ebcf0d913841 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiolifx-themes";
- version = "0.2.0";
+ version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Djelibeybi";
repo = "aiolifx-themes";
- rev = "v${version}";
- hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-sWEWfsew758jl6vLB7AQQ3nA83BFHF7YPy1ZaoPt45Y=";
};
prePatch = ''
@@ -52,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Color themes for LIFX lights running on aiolifx";
homepage = "https://github.com/Djelibeybi/aiolifx-themes";
+ changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ lukegb ];
};
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 6460c0c923db..820537137742 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
- version = "6.8.6";
+ version = "6.9.0";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Fx/o2tYgeLmBm1x01g61r6ow6py5ybqHBhSeVsVam24=";
+ sha256 = "sha256-FO+RmSDErMmAVH3tC9Qjp6J6CyMnc45ZM0P0RvOxJsY=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index 32b9c16db880..a4353a19204f 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -7,11 +7,12 @@
, pyric
, pytestCheckHook
, pythonOlder
+, usb-devices
}:
buildPythonPackage rec {
pname = "bluetooth-auto-recovery";
- version = "0.4.0";
+ version = "0.5.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4=";
+ hash = "sha256-LvLav3OCud1EZe3JXvjbuuKU9xtd6ywrx6pZLLP0N/A=";
};
nativeBuildInputs = [
@@ -31,6 +32,7 @@ buildPythonPackage rec {
async-timeout
btsocket
pyric
+ usb-devices
];
checkInputs = [
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index f0b221e5adff..c3d36290168f 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -12,42 +12,54 @@
, pythonOlder
, typing-extensions
, wrapt
+, uptime
}:
buildPythonPackage rec {
- pname = "python-can";
- version = "4.0.0";
+ pname = "can";
+ version = "4.1.0";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hardbyte";
- repo = pname;
- rev = version;
- hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc=";
+ repo = "python-can";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ=";
};
+ postPatch = ''
+ substituteInPlace tox.ini \
+ --replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" ""
+ '';
+
propagatedBuildInputs = [
msgpack
packaging
- pyserial
typing-extensions
wrapt
];
+ passthru.optional-dependencies = {
+ serial = [
+ pyserial
+ ];
+ seeedstudio = [
+ pyserial
+ ];
+ pcan = [
+ uptime
+ ];
+ };
+
checkInputs = [
future
hypothesis
parameterized
pytest-timeout
pytestCheckHook
- ];
-
- postPatch = ''
- substituteInPlace tox.ini \
- --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" ""
- '';
+ ] ++ passthru.optional-dependencies.serial;
disabledTestPaths = [
# We don't support all interfaces
@@ -74,6 +86,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "CAN support for Python";
homepage = "https://python-can.readthedocs.io";
+ changelog = "https://github.com/hardbyte/python-can/releases/tag/v${version}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab sorki ];
};
diff --git a/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch b/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch
deleted file mode 100644
index 8233af78a9de..000000000000
--- a/pkgs/development/python-modules/cryptography/cryptography-py27-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Delete the warning that breaks tests of dependent projects.
-
---- a/src/cryptography/__init__.py
-+++ b/src/cryptography/__init__.py
-@@ -33,9 +32,0 @@ __all__ = [
--
--if sys.version_info[0] == 2:
-- warnings.warn(
-- "Python 2 is no longer supported by the Python core team. Support for "
-- "it is now deprecated in cryptography, and will be removed in the "
-- "next release.",
-- CryptographyDeprecationWarning,
-- stacklevel=2,
-- )
diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index 24551340a0a8..f5edffd3e442 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -1,42 +1,61 @@
{ lib
+, aiomysql
+, aiopg
+, aiosqlite
+, asyncmy
+, asyncpg
, buildPythonPackage
, fetchFromGitHub
-, sqlalchemy
-, aiocontextvars
-, aiopg
-, pythonOlder
, pytestCheckHook
-, pymysql
-, asyncpg
-, aiomysql
-, aiosqlite
+, pythonOlder
+, sqlalchemy
}:
buildPythonPackage rec {
pname = "databases";
- version = "0.6.1";
+ version = "0.6.2";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
- rev = version;
- hash = "sha256-kHsA9XpolGmtuAGzRTj61igooLG9/LBQyv7TtuqiJ/A=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-3zgHfYGiO2xWualLa4h8A85qjC32ILadw/47Ul1GTmM=";
};
propagatedBuildInputs = [
- aiopg
- aiomysql
- aiosqlite
- asyncpg
- pymysql
sqlalchemy
- ] ++ lib.optionals (pythonOlder "3.7") [
- aiocontextvars
];
+ passthru.optional-dependencies = {
+ postgresql = [
+ asyncpg
+ ];
+ asyncpg = [
+ asyncpg
+ ];
+ aiopg = [
+ aiopg
+ ];
+ mysql = [
+ aiomysql
+ ];
+ aiomysql = [
+ aiomysql
+ ];
+ asyncmy = [
+ asyncmy
+ ];
+ sqlite = [
+ aiosqlite
+ ];
+ aiosqlite = [
+ aiosqlite
+ ];
+ };
+
checkInputs = [
pytestCheckHook
];
@@ -56,6 +75,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Async database support for Python";
homepage = "https://github.com/encode/databases";
+ changelog = "https://github.com/encode/databases/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
};
diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index 8b697fe2442c..0d914ce6786e 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -24,11 +24,12 @@
, tornado
, urllib3
, webob
+, wrapt
}:
buildPythonPackage rec {
pname = "elastic-apm";
- version = "6.12.0";
+ version = "6.13.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -37,7 +38,7 @@ buildPythonPackage rec {
owner = "elastic";
repo = "apm-agent-python";
rev = "refs/tags/v${version}";
- hash = "sha256-tAX96aOPuwtchLk5A1ANuZI5w5H9/yX3Zj9bRSyHv90=";
+ hash = "sha256-HbIra8Cxgn/2xOVEvtcc7rMtSLBmWMxxHlIM44Oy+8U=";
};
propagatedBuildInputs = [
@@ -48,6 +49,7 @@ buildPythonPackage rec {
starlette
tornado
urllib3
+ wrapt
];
checkInputs = [
@@ -84,6 +86,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python agent for the Elastic APM";
homepage = "https://github.com/elastic/apm-agent-python";
+ changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix
index 2c549030e6d7..da4ba40a9246 100644
--- a/pkgs/development/python-modules/exif/default.nix
+++ b/pkgs/development/python-modules/exif/default.nix
@@ -2,25 +2,22 @@
buildPythonPackage rec {
pname = "exif";
- version = "1.2.0";
+ version = "1.3.5";
disabled = !isPy3k;
src = fetchFromGitLab {
owner = "TNThieding";
repo = "exif";
- rev = "686857c677f489759db90b1ad61fa1cc1cac5f9a";
- sha256 = "0z2if23kmi0iyxviz32mlqs997i3dqpqfz6nznlwkhkkb6rkwwnh";
+ rev = "v${version}";
+ sha256 = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E=";
};
propagatedBuildInputs = [ plum-py ];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "plum-py==0.3.1" "plum-py>=0.3.1"
- '';
-
checkInputs = [ pytestCheckHook baseline ];
+ pythonImportsCheck = [ "exif" ];
+
meta = with lib; {
description = "Read and modify image EXIF metadata using Python";
homepage = "https://gitlab.com/TNThieding/exif";
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 25aa995f9122..53c388690140 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -1,25 +1,45 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flake8
+, pycodestyle
+, pylama
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "flake8-import-order";
- version = "0.18.1";
+ version = "0.18.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
+ hash = "sha256-4jlB+JLaPgwJ1xG6u7DHO8c1JC6bIWtyZhZ1ipINkA4=";
};
- propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
+ propagatedBuildInputs = [
+ pycodestyle
+ ];
- checkInputs = [ pytest flake8 pycodestyle pylama ];
+ checkInputs = [
+ flake8
+ pycodestyle
+ pylama
+ pytestCheckHook
+ ];
- checkPhase = ''
- pytest --strict
- '';
+ pythonImportsCheck = [
+ "flake8_import_order"
+ ];
meta = with lib; {
description = "Flake8 and pylama plugin that checks the ordering of import statements";
homepage = "https://github.com/PyCQA/flake8-import-order";
+ changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst";
license = with licenses; [ lgpl3 mit ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix
index 9b90012695e0..fb5f098f0d9f 100644
--- a/pkgs/development/python-modules/geomet/default.nix
+++ b/pkgs/development/python-modules/geomet/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "geomet";
- version = "0.3.1";
+ version = "1.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "geomet";
repo = "geomet";
rev = "refs/tags/${version}";
- hash = "sha256-7QfvGQlg4nTr1rwTyvTNm6n/jFptLtpBKMjjQj6OXCQ=";
+ hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw=";
};
propagatedBuildInputs = [
@@ -32,6 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary) and vice versa";
homepage = "https://github.com/geomet/geomet";
+ changelog = "https://github.com/geomet/geomet/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ turion ris ];
};
diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index addc372f8a7e..b8526212b752 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "globus-sdk";
- version = "3.14.0";
+ version = "3.15.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "globus";
repo = "globus-sdk-python";
rev = "refs/tags/${version}";
- hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA=";
+ hash = "sha256-g4QdVxZmlr4iVL0n/XG+dKm5CCjKO4oi5Xw+lgH+xv8=";
};
propagatedBuildInputs = [
@@ -56,6 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
homepage = "https://github.com/globus/globus-sdk-python";
+ changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ixxie ];
};
diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix
index e638997be79e..4d979d0e082f 100644
--- a/pkgs/development/python-modules/h3/default.nix
+++ b/pkgs/development/python-modules/h3/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "h3";
- version = "3.7.4";
+ version = "3.7.6";
# pypi version does not include tests
src = fetchFromGitHub {
owner = "uber";
repo = "h3-py";
rev = "refs/tags/v${version}";
- sha256 = "sha256-/DtQD2M+5kBn1RxAOobVqtu32+1cxN8lZSuGH613Bwc=";
+ sha256 = "sha256-QNiuiHJ4IMxpi39iobPSSlYUUj5oxpxO4B2+HXVQ/Zk=";
};
dontConfigure = true;
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 570c61d186f5..c163ae26a9e7 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "holidays";
- version = "0.17";
+ version = "0.17.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-nxa2Dwe+KgPKqj1sqLDWau6JkLcgag0TlM4x+tK0JC4=";
+ hash = "sha256-EWBFNfZq2dj4TlHBcQKWDof8OBn4RESvaLHrh1aGZjA=";
};
propagatedBuildInputs = [
@@ -39,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Generate and work with holidays in Python";
homepage = "https://github.com/dr-prodigy/python-holidays";
+ changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}";
license = licenses.mit;
maintainers = with maintainers; [ jluttine ];
};
diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix
index aba7e19b69e0..1c8cd9417827 100644
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@@ -17,16 +17,16 @@
buildPythonPackage rec {
pname = "homematicip";
- version = "1.0.9";
+ version = "1.0.10";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "hahn-th";
repo = "homematicip-rest-api";
rev = "refs/tags/${version}";
- hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA=";
+ hash = "sha256-CnZHR5JyZm4T6Fm5VumZJujQvEdw59c7GSwcyO7EXXY=";
};
propagatedBuildInputs = [
@@ -86,6 +86,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for the homematicIP REST API";
homepage = "https://github.com/hahn-th/homematicip-rest-api";
+ changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${version}";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 14d11af62e3b..16dcf7e54235 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "hvplot";
- version = "0.8.1";
+ version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-U93+BnQ8TVkk+x5ZdlW/oU6A/q9XpDi/0oRC02rHwrY=";
+ hash = "sha256-/q2zlawBoL5fyJFVRSRGwrnEEqmdY+rAKQgxOBY9XBs=";
};
propagatedBuildInputs = [
@@ -37,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A high-level plotting API for the PyData ecosystem built on HoloViews";
homepage = "https://hvplot.pyviz.org";
+ changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
};
diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix
index a596dbe902b6..35959520b35c 100644
--- a/pkgs/development/python-modules/json-logging/default.nix
+++ b/pkgs/development/python-modules/json-logging/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bobbui";
repo = "json-logging-python";
- rev = version;
+ rev = "refs/tags/${version}";
hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE=";
};
@@ -53,6 +53,7 @@ buildPythonPackage rec {
infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver.
'';
homepage = "https://github.com/bobbui/json-logging-python";
+ changelog = "https://github.com/bobbui/json-logging-python/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ AluisioASG ];
};
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 057d870a83f1..c69dac517679 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -27,17 +27,17 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.6.3";
- disabled = pythonOlder "3.6";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "refs/tags/v${version}";
- sha256 = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA=";
+ hash = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA=";
};
- format = "pyproject";
-
propagatedBuildInputs = [
click
desktop-notifier
@@ -83,9 +83,13 @@ buildPythonPackage rec {
"test_filestatus"
"test_path_exists_case_insensitive"
"test_cased_path_candidates"
+ # AssertionError
+ "test_locking_multiprocess"
];
- pythonImportsCheck = [ "maestral" ];
+ pythonImportsCheck = [
+ "maestral"
+ ];
passthru.tests.maestral = nixosTests.maestral;
diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix
index ada014a6b81d..e0d7928e54b2 100644
--- a/pkgs/development/python-modules/mastodon-py/default.nix
+++ b/pkgs/development/python-modules/mastodon-py/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "mastodon-py";
- version = "1.6.3";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "halcy";
repo = "Mastodon.py";
rev = "refs/tags/${version}";
- sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo=";
+ sha256 = "sha256-QavgCWWiGmGnNoEX7pxzUyujEQObXhkaucv4FduZ/Vg=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 51123d05ef4a..7f994b4682d8 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -33,7 +33,7 @@ let
};
in buildPythonPackage rec {
pname = "nbconvert";
- version = "7.2.3";
+ version = "7.2.5";
disabled = pythonOlder "3.7";
@@ -41,7 +41,7 @@ in buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-eufMxoSVtWXasVNFnufmUDmXCRPrEVBw2m4sZzzw6fg=";
+ hash = "sha256-j9xE/X2UJNt/3G4eg0oC9rhiD/tlN2c4i+L56xb4QYQ=";
};
# Add $out/share/jupyter to the list of paths that are used to search for
diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix
index 50a33266c8fa..5b963cbfef4e 100644
--- a/pkgs/development/python-modules/plum-py/default.nix
+++ b/pkgs/development/python-modules/plum-py/default.nix
@@ -2,20 +2,17 @@
buildPythonPackage rec {
pname = "plum-py";
- version = "0.4.0";
+ version = "0.8.5";
disabled = !isPy3k;
src = fetchFromGitLab {
owner = "dangass";
repo = "plum";
- rev = "6a9ff863c0e9fa21f7b2230d25402155a5522e4b";
- sha256 = "1iv62yb704c61b0dvsmyp3j6xpbmay532g9ny4pw4zbg3l69vd5j";
+ rev = version;
+ sha256 = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg=";
};
- postPatch = ''
- substituteInPlace src/plum/int/flag/_flag.py \
- --replace 'if sys.version_info < (3, 7):' 'if True:'
- '';
+ pythonImportsCheck = [ "plum" ];
checkInputs = [ pytest baseline ];
checkPhase = "pytest tests";
diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 5fb31f9fdde2..03ed9fc5884d 100644
--- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, aiohttp
, requests
+, fastapi
, pythonOlder
}:
@@ -21,6 +22,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
requests
+ fastapi
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix
index 00f257be765e..fa0ad7899ad8 100644
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydeps";
- version = "1.10.24";
+ version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "thebjorn";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-yDHIZk6+9K5hg4Q6pydd4NwnxSU1+u+dGUiUQph9ccY=";
+ hash = "sha256-XAx7B3v+7xYiW15nJgiL82YlNeBxW80M0Rq0LMMsWu0=";
};
buildInputs = [
@@ -54,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module dependency visualization";
homepage = "https://github.com/thebjorn/pydeps";
+ changelog = "https://github.com/thebjorn/pydeps/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix
index 171fa06830fb..4fd0bacc89e6 100644
--- a/pkgs/development/python-modules/pysensibo/default.nix
+++ b/pkgs/development/python-modules/pysensibo/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pysensibo";
- version = "1.0.21";
+ version = "1.0.22";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,14 +16,14 @@ buildPythonPackage rec {
owner = "andrey-git";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-YvriIG2G0NVlpzT91Ev13OJq8lNluqdEOTIQFQeWekI=";
+ hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc=";
};
propagatedBuildInputs = [
aiohttp
];
- # no tests implemented
+ # No tests implemented
doCheck = false;
pythonImportsCheck = [
@@ -33,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for interacting with Sensibo";
homepage = "https://github.com/andrey-git/pysensibo";
+ changelog = "https://github.com/andrey-git/pysensibo/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index ada950cd8aab..6037f9802b70 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "python-bsblan";
- version = "0.5.7";
+ version = "0.5.8";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "liudger";
repo = pname;
rev = "v${version}";
- hash = "sha256-eavARej+R8SPNuwX6LOGr43SJi1AuZszThJVG00vKhQ=";
+ hash = "sha256-pLqX+gbY71OsLflTyDuL4revj5dXol//eTFVy8iT9O4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix
index 65ddd8fd8b04..ecbf9c68e9a1 100644
--- a/pkgs/development/python-modules/pytrafikverket/default.nix
+++ b/pkgs/development/python-modules/pytrafikverket/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pytrafikverket";
- version = "0.2.1";
+ version = "0.2.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-LBOq1AvJrRmyWIe2w4dQbWvlRAJN6s2/lsJRI2LZK2o=";
+ hash = "sha256-NWQHrdTKb3RQ7ZjXpHyQ5qPPXuZUU7G+FvBx1VQEbss=";
};
propagatedBuildInputs = [
@@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to get data from the Swedish Transport Administration (Trafikverket) API";
homepage = "https://github.com/endor-force/pytrafikverket";
+ changelog = "https://github.com/endor-force/pytrafikverket/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix
index cb06b5d1f2b3..ea18d0c1b18c 100644
--- a/pkgs/development/python-modules/sanic-routing/default.nix
+++ b/pkgs/development/python-modules/sanic-routing/default.nix
@@ -3,25 +3,36 @@
, fetchFromGitHub
, pytestCheckHook
, pytest-asyncio
+, pythonOlder
}:
buildPythonPackage rec {
pname = "sanic-routing";
- version = "22.3.0";
+ version = "22.8.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sanic-org";
repo = "sanic-routing";
- rev = "v${version}";
- hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY=";
};
- checkInputs = [ pytestCheckHook pytest-asyncio ];
- pythonImportsCheck = [ "sanic_routing" ];
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "sanic_routing"
+ ];
meta = with lib; {
description = "Core routing component for the Sanic web framework";
homepage = "https://github.com/sanic-org/sanic-routing";
+ changelog = "https://github.com/sanic-org/sanic-routing/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
};
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index 120f80b57e22..907950abdfb0 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -1,21 +1,25 @@
{ lib
, buildPythonPackage
+, callPackage
, fetchFromGitHub
, httpx
+, pythonOlder
, sanic
, websockets
-, callPackage
}:
buildPythonPackage rec {
pname = "sanic-testing";
- version = "22.3.1";
+ version = "22.9.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sanic-org";
repo = "sanic-testing";
rev = "refs/tags/v${version}";
- sha256 = "sha256-6aJyc5B9e65RPG3FwXAoQByVNdrLAWTEu2/Dqf9hf+g=";
+ hash = "sha256-o0uXeIw2wV9sxGkEH5jPrQvRj1W2CsUU2n+8R8Ta12Y=";
};
outputs = [
@@ -23,10 +27,6 @@ buildPythonPackage rec {
"testsout"
];
- postPatch = ''
- sed -i 's/httpx>=.*"/httpx"/' setup.py
- '';
-
propagatedBuildInputs = [
httpx
sanic
@@ -38,8 +38,9 @@ buildPythonPackage rec {
cp -R tests $testsout/tests
'';
- # check in passthru.tests.pytest to escape infinite recursion with sanic
+ # Check in passthru.tests.pytest to escape infinite recursion with sanic
doCheck = false;
+
doInstallCheck = false;
passthru.tests = {
@@ -49,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Core testing clients for the Sanic web framework";
homepage = "https://github.com/sanic-org/sanic-testing";
+ changelog = "https://github.com/sanic-org/sanic-testing/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
};
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index e1559e1ec432..3302fa028ea9 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "sanic";
- version = "22.6.2";
+ version = "22.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -33,8 +33,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "sanic-org";
repo = pname;
- rev = "v${version}";
- hash = "sha256-krEQd0ak9Uua+r+pYmLStlizgE4HmZBO8Q0I2/gWAwU=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-KbcHnAdr59hk7W36BiTb/hD74ktj/DGzq1vcuZ/lGfQ=";
};
propagatedBuildInputs = [
@@ -104,6 +104,13 @@ buildPythonPackage rec {
"test_keep_alive_client_timeout"
"test_keep_alive_server_timeout"
"test_zero_downtime"
+ # TLS tests
+ "test_missing_sni"
+ "test_no_matching_cert"
+ "test_wildcards"
+ # They thtow execptions
+ "test_load_app_simple"
+ "worker/test_loader.py"
# broke with ujson 5.4 upgrade
# https://github.com/sanic-org/sanic/pull/2504
"test_json_response_json"
@@ -129,6 +136,7 @@ buildPythonPackage rec {
broken = stdenv.isDarwin;
description = "Web server and web framework";
homepage = "https://github.com/sanic-org/sanic/";
+ changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ costrouc AluisioASG ];
};
diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix
index 995a62230b22..afbc9ce83904 100644
--- a/pkgs/development/python-modules/textwrap3/default.nix
+++ b/pkgs/development/python-modules/textwrap3/default.nix
@@ -1,10 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, tox
-, pytest
-, coverage
-, pytest-cov
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -18,16 +15,9 @@ buildPythonPackage rec {
};
checkInputs = [
- tox
- pytest
- coverage
- pytest-cov
+ pytestCheckHook
];
- checkPhase = ''
- pytest
- '';
-
meta = with lib; {
description = "Textwrap from Python 3.6 backport plus a few tweaks";
homepage = "https://github.com/jonathaneunice/textwrap3";
diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix
new file mode 100644
index 000000000000..ac63251a72d1
--- /dev/null
+++ b/pkgs/development/python-modules/usb-devices/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "usb-devices";
+ version = "0.4.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "Bluetooth-Devices";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-9w7YCAEpdptQC0GCnJCEyhZgcHMDIw0alj7q4Y82hmA=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace " --cov=usb_devices --cov-report=term-missing:skip-covered" ""
+ '';
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "usb_devices"
+ ];
+
+ meta = with lib; {
+ description = "Library for for mapping, describing, and resetting USB devices";
+ homepage = "https://github.com/Bluetooth-Devices/usb-devices";
+ changelog = "https://github.com/Bluetooth-Devices/usb-devices/blob/v${version}/CHANGELOG.md";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
index 9703590bd4a7..593da6428e7d 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
@@ -5,7 +5,7 @@
, lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater
-, python27, python3, writeScript
+, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -406,11 +406,9 @@ stdenv.mkDerivation rec {
genericPatches = ''
# Substitute j2objc and objc wrapper's python shebang to plain python path.
- # These scripts explicitly depend on Python 2.7, hence we use python27.
- # See also `postFixup` where python27 is added to $out/nix-support
- substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+ substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|g' \
@@ -424,8 +422,6 @@ stdenv.mkDerivation rec {
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
- # We default to python3 where possible. See also `postFixup` where
- # python3 is added to $out/nix-support
substituteInPlace "$path" \
--replace /bin/bash ${customBash}/bin/bash \
--replace "/usr/bin/env bash" ${customBash}/bin/bash \
@@ -616,10 +612,6 @@ stdenv.mkDerivation rec {
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tar’d up into a .jar,
# so nix can’t detect python is needed in the runtime closure
- # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
- # default to using python3. Therefore, both python27 and python3 are
- # runtime dependencies.
- echo "${python27}" >> $out/nix-support/depends
echo "${python3}" >> $out/nix-support/depends
# The string literal specifying the path to the bazel-rc file is sometimes
# stored non-contiguously in the binary due to gcc optimisations, which leads
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
index 99897364e6af..24580faa20ff 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
@@ -7,7 +7,7 @@
, lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater
-, python27, python3, writeScript
+, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -102,10 +102,6 @@ let
# "@bison//:bin/bison",
# ],
# )
- #
- # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
- # default to using python3. Therefore, both python27 and python3 are
- # runtime dependencies.
[
bash
coreutils
@@ -116,7 +112,6 @@ let
gnused
gnutar
gzip
- python27
python3
unzip
which
@@ -432,11 +427,9 @@ stdenv.mkDerivation rec {
genericPatches = ''
# Substitute j2objc and objc wrapper's python shebang to plain python path.
- # These scripts explicitly depend on Python 2.7, hence we use python27.
- # See also `postFixup` where python27 is added to $out/nix-support
- substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+ substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|g' \
@@ -450,8 +443,6 @@ stdenv.mkDerivation rec {
grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
- # We default to python3 where possible. See also `postFixup` where
- # python3 is added to $out/nix-support
substituteInPlace "$path" \
--replace /bin/bash ${bash}/bin/bash \
--replace "/usr/bin/env bash" ${bash}/bin/bash \
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
index 491a02d74d0d..7b2bef113b33 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -7,7 +7,7 @@
, lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater
-, python27, python3, writeScript
+, python3, writeScript
# Apple dependencies
, cctools, libcxx, sigtool, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -100,10 +100,6 @@ let
# "@bison//:bin/bison",
# ],
# )
- #
- # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
- # default to using python3. Therefore, both python27 and python3 are
- # runtime dependencies.
[
bash
coreutils
@@ -114,7 +110,6 @@ let
gnused
gnutar
gzip
- python27
python3
unzip
which
@@ -393,11 +388,9 @@ stdenv.mkDerivation rec {
genericPatches = ''
# Substitute j2objc and objc wrapper's python shebang to plain python path.
- # These scripts explicitly depend on Python 2.7, hence we use python27.
- # See also `postFixup` where python27 is added to $out/nix-support
- substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
- substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+ substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
+ substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|g' \
@@ -414,8 +407,6 @@ stdenv.mkDerivation rec {
grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
- # We default to python3 where possible. See also `postFixup` where
- # python3 is added to $out/nix-support
substituteInPlace "$path" \
--replace /bin/bash ${bash}/bin/bash \
--replace "/usr/bin/env bash" ${bash}/bin/bash \
@@ -426,7 +417,7 @@ stdenv.mkDerivation rec {
grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
substituteInPlace "$path" \
- --replace "/usr/bin/env python2" ${python27}/bin/python \
+ --replace "/usr/bin/env python2" ${python3.interpreter} \
--replace "/usr/bin/env python3" ${python3}/bin/python \
--replace /usr/bin/env ${coreutils}/bin/env
done
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
index b8e00bb95aed..832ca7062d5e 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
@@ -7,7 +7,7 @@
, lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater
-, python27, python3, writeScript
+, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -103,10 +103,6 @@ let
# "@bison//:bin/bison",
# ],
# )
- #
- # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
- # default to using python3. Therefore, both python27 and python3 are
- # runtime dependencies.
[
bash
coreutils
@@ -117,7 +113,6 @@ let
gnused
gnutar
gzip
- python27
python3
unzip
which
@@ -414,8 +409,6 @@ stdenv.mkDerivation rec {
grep -rlZ /bin/ src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
# If you add more replacements here, you must change the grep above!
# Only files containing /bin are taken into account.
- # We default to python3 where possible. See also `postFixup` where
- # python3 is added to $out/nix-support
substituteInPlace "$path" \
--replace /bin/bash ${bash}/bin/bash \
--replace "/usr/bin/env bash" ${bash}/bin/bash \
@@ -426,7 +419,7 @@ stdenv.mkDerivation rec {
grep -rlZ /bin/ tools/python | while IFS="" read -r -d "" path; do
substituteInPlace "$path" \
- --replace "/usr/bin/env python2" ${python27}/bin/python \
+ --replace "/usr/bin/env python2" ${python3.interpreter} \
--replace "/usr/bin/env python3" ${python3}/bin/python \
--replace /usr/bin/env ${coreutils}/bin/env
done
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index bc13fa471114..3c831cd9f7b8 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -80,7 +80,9 @@ in stdenv.mkDerivation rec {
# this on our patch for Flatpak 0.99.
(substituteAll {
src = ./fix-test-paths.patch;
- inherit glibcLocales python2;
+ inherit glibcLocales;
+ # FIXME use python3 for tests that rely on python2
+ # inherit python2;
})
];
@@ -137,7 +139,7 @@ in stdenv.mkDerivation rec {
installedTestsDependencies = [
gnupg
ostree
- python2
+ # FIXME python2
gnumake
];
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index a03586c48166..bff6f36c805b 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
- hash = "sha256-mzVwdvMYpThSPGvM3hpuKzeHZW5HOwkEfONIN/aziXY=";
+ hash = "sha256-qoKmYFwGgJrv39g6XvcUkYkjjfrfcxAztjsuTxwnVBM=";
};
- cargoSha256 = "sha256-dDaXmJ4wFJaE59qR5Bxvoz/Jrwt6hhWhJI8wLRXCLcU=";
+ cargoSha256 = "sha256-XJkcwaDgorRwKmMTMGN2z9ONTlO0ftjP9V4/OPpDClc=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix
new file mode 100644
index 000000000000..95b1a5cc12a8
--- /dev/null
+++ b/pkgs/development/tools/misc/strace-analyzer/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, strace
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "strace-analyzer";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "wookietreiber";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-ICUXedWg7ZT2Uzk7ZLpFqoEXiG4AzvkwCndR2aHKjVI=";
+ };
+
+ cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE=";
+
+ checkInputs = [ strace ];
+
+ meta = with lib; {
+ description = "Analyzes strace output";
+ homepage = "https://github.com/wookietreiber/strace-analyzer";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix
index 7570dd586f0a..0148cbb7f97c 100644
--- a/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "terraform-ls";
- version = "0.29.3";
+ version = "0.30.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CYbeRhwoffyELM0REZL14m4tTe/66GDToqNKcEfmums=";
+ sha256 = "sha256-CyWOXyJ9c7gf+WznU1SLX7tEM1f95015w9ePVwZ7GJU=";
};
- vendorSha256 = "sha256-wbB3/RfzL05SaLv49gs7WKrjV//dM3SjpbMNGI1yH4I=";
+ vendorSha256 = "sha256-UYFw9srf4FcF2XGIfsJQsRapEwcOHql59rKeKUnXPLo=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix
index bdcf05d97001..c6e5c3da0164 100644
--- a/pkgs/development/tools/ocaml/dune/3.nix
+++ b/pkgs/development/tools/ocaml/dune/3.nix
@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
- version = "3.6.0";
+ version = "3.6.1";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
- sha256 = "sha256-CKDGyVIWBOYM82r7oDbs8bEH31Hu0Uovt+72z90r8ng=";
+ sha256 = "sha256-8dWsBLegJ/PVSeJc+IXr96zBNeApHBjmtDEjp5nBQ84=";
};
nativeBuildInputs = [ ocaml findlib ];
diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index 858da93e96e6..92e1efefbc8d 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "oh-my-posh";
- version = "12.17.2";
+ version = "12.20.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3/spbZhFa9IwScjJqdiwASiojXxuFLW+WXCteOAePOM=";
+ hash = "sha256-nGhPfwZw73w0iJLdBiXjRQnKPnKIuk6K/5GFKeHlcVw=";
};
- vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
+ vendorHash = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
sourceRoot = "source/src";
@@ -34,6 +34,6 @@ buildGoModule rec {
description = "A prompt theme engine for any shell";
homepage = "https://ohmyposh.dev";
license = licenses.mit;
- maintainers = with maintainers; [ lucperkins ];
+ maintainers = with maintainers; [ lucperkins urandom ];
};
}
diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix
index fc34656edcd8..737373ff628a 100644
--- a/pkgs/development/tools/rust/cargo-hack/default.nix
+++ b/pkgs/development/tools/rust/cargo-hack/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
- version = "0.5.22";
+ version = "0.5.23";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-TuHCKitlCCV//VBi514IMdcscsBc4yibfdsCO/nmisU=";
+ sha256 = "sha256-5iFc8wEejCuD8HbaJv2XuZ/LP7aPtGJk+gXTJqAr8aM=";
};
- cargoSha256 = "sha256-2tF6553SGbBrGkTznk3zWMweQjks+Z699HE1l0DVYec=";
+ cargoSha256 = "sha256-U6F/5VeALxs8YysU4VOLBUCu8d0Iaf3VRE7g2zRTAkg=";
# some necessary files are absent in the crate version
doCheck = false;
diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix
index 4e9d738ca30a..8511d3c249aa 100644
--- a/pkgs/development/tools/uniffi-bindgen/default.nix
+++ b/pkgs/development/tools/uniffi-bindgen/default.nix
@@ -6,18 +6,19 @@
, yapf
, rubocop
, rustfmt
+, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "uniffi-bindgen";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-E0OMMg9GuZCwPuJKzMpN0PNxZicGW1blD322Jl01qQE=";
+ sha256 = "sha256-yVpxyYaFkX1HuFi4xcj45rsMbMIcdTHs9zfGvtcFdH8=";
};
- cargoSha256 = "sha256-REY88irDm45JOBwdb79JVrIyfuOB6HcAgIzYO65O0uE=";
+ cargoSha256 = "sha256-qn27aRVdD+/EWmCSF2t+CdMhtOknDCVnG9uDa2Rwf0A=";
nativeBuildInputs = [ makeWrapper ];
@@ -31,6 +32,10 @@ rustPlatform.buildRustPackage rec {
--suffix PATH : ${lib.strings.makeBinPath [ ktlint yapf rubocop rustfmt ] }
'';
+ passthru.updateScript = nix-update-script {
+ attrPath = pname;
+ };
+
meta = with lib; {
description = "Toolkit for building cross-platform software components in Rust";
homepage = "https://mozilla.github.io/uniffi-rs/";
diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix
index 13c8ff8d0df1..23c3b4a5c098 100644
--- a/pkgs/development/tools/vendir/default.nix
+++ b/pkgs/development/tools/vendir/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vendir";
- version = "0.32.0";
+ version = "0.32.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-vendir";
rev = "v${version}";
- sha256 = "sha256-VuOf+8PgscoHNVPO8gDoFGGPSBxO5BNLpmUJnYL898s=";
+ sha256 = "sha256-IgPUqIR9xuLEglVqVHz2KvqqCHpCPYv8TX+Z6q5xCNA=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index 76d1df8be645..459de3928209 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -303,7 +303,7 @@ in rec {
workspaceDependenciesTransitive;
in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // {
- inherit src pname;
+ inherit src version pname;
name = baseName;
@@ -376,11 +376,10 @@ in rec {
meta = {
inherit (nodejs.meta) platforms;
- description = packageJSON.description or "";
- homepage = packageJSON.homepage or "";
- version = packageJSON.version or "";
- license = if packageJSON ? license then getLicenseFromSpdxId packageJSON.license else "";
- } // (attrs.meta or {});
+ } // lib.optionalAttrs (package ? description) { inherit (package) description; }
+ // lib.optionalAttrs (package ? homepage) { inherit (package) homepage; }
+ // lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; }
+ // (attrs.meta or {});
});
yarn2nix = mkYarnPackage {
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 37138f152b6a..c6f8db0ea9e7 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
+{ lib, stdenv, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems }:
stdenv.mkDerivation rec {
pname = "sienna";
- version = "1.0c";
+ version = "1.0d";
+
src = fetchurl {
url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
- sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6";
+ sha256 = "sha256-1bFjhN7jL/PMYMJH1ete6uyHTYsTGgoP60sf/sJTLlU=";
};
icon = fetchurl {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn";
};
- desktopItem = makeDesktopItem {
+ desktopItems = [ (makeDesktopItem {
name = "sienna";
exec = pname;
icon = icon;
@@ -21,33 +22,29 @@ stdenv.mkDerivation rec {
desktopName = "Sienna";
genericName = "sienna";
categories = [ "Game" ];
- };
+ }) ];
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ lua love ];
+ nativeBuildInputs = [ makeWrapper copyDesktopItems ];
dontUnpack = true;
- installPhase =
- ''
+ installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mkdir -p $out/share/games/lovegames
cp -v $src $out/share/games/lovegames/${pname}.love
makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
-
- chmod +x $out/bin/${pname}
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications/
+ runHook postInstall
'';
meta = with lib; {
description = "Fast-paced one button platformer";
+ homepage = "https://tangramgames.dk/games/sienna";
maintainers = with maintainers; [ leenaars ];
platforms = platforms.linux;
license = licenses.free;
- downloadPage = "http://tangramgames.dk/games/sienna";
};
}
diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
index 8ddc97890e92..06b6ef47d430 100644
--- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl }:
+{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }:
stdenvNoCC.mkDerivation rec {
pname = "alsa-firmware";
@@ -9,6 +9,14 @@ stdenvNoCC.mkDerivation rec {
sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
+ patches = [
+ # fixes some includes / missing types on musl libc; should not make a difference for other platforms
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/void-linux/void-packages/ae690000017d5fd355ab397c49202426e3a01c11/srcpkgs/alsa-firmware/patches/musl.patch";
+ sha256 = "sha256-4A+TBBvpz14NwMNewLc2LQL51hnz4EZlZ44rhnx5dnc=";
+ })
+ ];
+
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 458caf06433c..7eb61d56c658 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,52 +2,52 @@
"4.14": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.299-hardened1.patch",
- "sha256": "1qgsi8kfbfqqkb2n0irqfrbq865dz4f5hmhxq7fbmnpacjgwdy6a",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.299-hardened1/linux-hardened-4.14.299-hardened1.patch"
+ "name": "linux-hardened-4.14.300-hardened1.patch",
+ "sha256": "1y43qxcn00w1gayjj1rr3vfws8m4f2p9nz080nqilw0g14kq73sa",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.300-hardened1/linux-hardened-4.14.300-hardened1.patch"
},
- "sha256": "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6",
- "version": "4.14.299"
+ "sha256": "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y",
+ "version": "4.14.300"
},
"4.19": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.265-hardened1.patch",
- "sha256": "0psqvwqvq981hvix58z5bhc4xvgm2ic5y4q7bwsnh1cfvbfg6x2k",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.265-hardened1/linux-hardened-4.19.265-hardened1.patch"
+ "name": "linux-hardened-4.19.267-hardened1.patch",
+ "sha256": "0phlfwigzh2j5j8xjqamywqn8libpzvhingx0vjxggf0wqxvgix0",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.267-hardened1/linux-hardened-4.19.267-hardened1.patch"
},
- "sha256": "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p",
- "version": "4.19.265"
+ "sha256": "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l",
+ "version": "4.19.267"
},
"5.10": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.10.154-hardened1.patch",
- "sha256": "0srwi4033h8ypxbwwp1hb3y989jvlwzckvsfjkxzgpnj91i68hn9",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.154-hardened1/linux-hardened-5.10.154-hardened1.patch"
+ "name": "linux-hardened-5.10.156-hardened1.patch",
+ "sha256": "1caf5136i8k4afr1jfbnnqgbhq877in3azicbpazcgv1js9f0n30",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.156-hardened1/linux-hardened-5.10.156-hardened1.patch"
},
- "sha256": "12763vlnrgmgj03khj9ls2g7zlhclj9g1l3008b36j9jli6kvbn6",
- "version": "5.10.154"
+ "sha256": "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7",
+ "version": "5.10.156"
},
"5.15": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.15.78-hardened1.patch",
- "sha256": "1aavp00rswqbbpbyx0c7k2ga6lcd221gcgr4893q7w5z26mv7wkd",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.78-hardened1/linux-hardened-5.15.78-hardened1.patch"
+ "name": "linux-hardened-5.15.79-hardened1.patch",
+ "sha256": "102zaxvyjq1gwnp69w3941ni92sv7k1fsf35f1f9vj0hj6jig7j3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.79-hardened1/linux-hardened-5.15.79-hardened1.patch"
},
- "sha256": "16d4d4g5n2g6jpp8bvad1bm1l0b0nb4ckwsmq6w2g3538xrrzf8d",
- "version": "5.15.78"
+ "sha256": "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb",
+ "version": "5.15.79"
},
"5.4": {
"patch": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.224-hardened1.patch",
- "sha256": "1cx0h6sn8wdggg9nwqlrij7cfpa9q6nah73nrv92b4c9n8sjqiwq",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.224-hardened1/linux-hardened-5.4.224-hardened1.patch"
+ "name": "linux-hardened-5.4.225-hardened1.patch",
+ "sha256": "09h8bjq73fyx6kqk0kcy3z2a0cs32gg4visv859siwb8rw1ziva2",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.225-hardened1/linux-hardened-5.4.225-hardened1.patch"
},
- "sha256": "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb",
- "version": "5.4.224"
+ "sha256": "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar",
+ "version": "5.4.225"
},
"6.0": {
"patch": {
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 7c2fc0ee9fdf..676302eb1e05 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.299";
+ version = "4.14.300";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0p5ic2mrb9vl3qkzvqxhia3kygjv8xa6s1kqkwgd6b4rmq1kc8r6";
+ sha256 = "047vmh09icm45g7mnmdvyj9cam7747bcpah1s7n9dm5i2j2f906y";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index aae0bf463c8e..734fa93fa207 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.265";
+ version = "4.19.267";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1l5cdpgng1gci1p1gdr2jzqw486h3w56gpyc7fbq74hlc6nnwh1p";
+ sha256 = "035yxx13jz5f5ig2r6ybzgivm8vjafgnvjws0jfzha4w6klf7r9l";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 4e55c5c7dbe3..379259f16bc3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.155";
+ version = "5.10.156";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1wyla96qsdf50n7qjj4hdf36bj56whv7gc9mgw9bvrsqdi92gc7i";
+ sha256 = "08srjps110zi4ivzh0z2jf78ddyfj2wivdliffb2f03jr9j9k7k7";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index a602ac51d91d..279eaf85dd2c 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.79";
+ version = "5.15.80";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0m61k7k6lj24z9a266q08wzghggjik2wizcabdwd1vn0vcqr18yb";
+ sha256 = "0kgxznd3sfbmnygjvp9dzhzg5chxlaxk6kldxmh1y0njcrj1lciv";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index ed46ce896dba..d4f06b7b2f83 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.224";
+ version = "5.4.225";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0dixs4w7nmkjgxv9dxgjdy8v6r4parkpqyvdfyr0wqk0amdz4zcb";
+ sha256 = "1ak0qlxzfylgvkldh2whq4mzynh1rymhnnc1yif9a5s3f7v9dxar";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix
index 709c0599dc07..55c70ccaf60f 100644
--- a/pkgs/os-specific/linux/kernel/linux-6.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "6.0.9";
+ version = "6.0.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
- sha256 = "1irip1yk62carcisxlacwcxsiqib4qswx6h5mfhv8f97x04a4531";
+ sha256 = "1l0xak4w7c16cg8lhracy8r18zzdl0x5s654w6ivyw6dhk6pzr9r";
};
} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 0a397d639360..60873fd8adde 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "18978";
- sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi";
+ rev = "18996";
+ sha256 = "0dflbcpdd75xwy5amk9665q9w6dvrybs0sdm61c6pydx4kd0b3ws";
}
, ...
}:
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
index e4c8be02cbb0..ae028b980ce2 100644
--- a/pkgs/os-specific/linux/kernel/perf/default.nix
+++ b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -78,7 +78,10 @@ stdenv.mkDerivation {
patchShebangs pmu-events/jevents.py
'';
- makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags;
+ makeFlags = [ "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" ] ++ kernel.makeFlags
+ ++ lib.optional (!withGtk) "NO_GTK2=1"
+ ++ lib.optional (!withZstd) "NO_LIBZSTD=1"
+ ++ lib.optional (!withLibcap) "NO_LIBCAP=1";
hardeningDisable = [ "format" ];
@@ -127,7 +130,7 @@ stdenv.mkDerivation {
doCheck = false; # requires "sparse"
- installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ];
+ installTargets = [ "install" "install-man" ];
# TODO: Add completions based on perf-completion.sh
postInstall = ''
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index acb325a6e09f..4fde1dcf910d 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
];
patches = lib.optionals stdenv.hostPlatform.isMusl [
- (fetchpatch {
- url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
- sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";
- })
# http://openwall.com/lists/musl/2015/08/18/10
(fetchpatch {
url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 99185125836f..c91d00e8a7ea 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.14.0";
+ version = "1.14.1";
rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "sha256-so+JtDcIWRF8HaoiqalxKxzl8ITonDABXK07guwIYRA=";
+ sha256 = "sha256-iitwWFtgz4juqNFa6d6c+OzVo227gOOyWSwz+4cDgsc=";
};
passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec {
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- vendorSha256 = "sha256-cCfC/PcpNRQ3UL7OGk2ydCN8wNPvyJTGYMANfqpMHKg=";
+ vendorSha256 = "sha256-hECWi+jWfrmIqzsWQSoWxohGbF9Hcg2ZkBHBaTrjK+U=";
doCheck = false;
diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix
index 1215fbd34094..88648fa1e131 100644
--- a/pkgs/servers/frr/default.nix
+++ b/pkgs/servers/frr/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
# build time
, autoreconfHook
@@ -33,23 +32,15 @@
stdenv.mkDerivation rec {
pname = "frr";
- version = "8.3.1";
+ version = "8.4.1";
src = fetchFromGitHub {
owner = "FRRouting";
repo = pname;
rev = "${pname}-${version}";
- hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0=";
+ hash = "sha256-SJKDIs6bL8NroSieNeSYBv+8JTGgFdhP4WYKUWYhpbk=";
};
- patches = [
- (fetchpatch {
- name = "CVE-2022-37032.patch";
- url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch";
- sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag=";
- })
- ];
-
nativeBuildInputs = [
autoreconfHook
bison
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 6e8dbf7e7dbd..299be96bae04 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -41,6 +41,16 @@ let
};
});
+ arcam-fmj = super.arcam-fmj.overridePythonAttrs (old: rec {
+ disabledTestPaths = [
+ # incompatible with pytest-aiohttp 0.3.0
+ # see https://github.com/elupus/arcam_fmj/pull/12
+ "tests/test_fake.py"
+ "tests/test_standard.py"
+ "tests/test_utils.py"
+ ];
+ });
+
backoff = super.backoff.overridePythonAttrs (oldAttrs: rec {
version = "1.11.1";
src = fetchFromGitHub {
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index f3c4a31bc855..c4fe7f892051 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -79,11 +79,11 @@ stdenv.mkDerivation {
"--http-log-path=/var/log/nginx/access.log"
"--error-log-path=/var/log/nginx/error.log"
"--pid-path=/var/log/nginx/nginx.pid"
- "--http-client-body-temp-path=/var/cache/nginx/client_body"
- "--http-proxy-temp-path=/var/cache/nginx/proxy"
- "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi"
- "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi"
- "--http-scgi-temp-path=/var/cache/nginx/scgi"
+ "--http-client-body-temp-path=/tmp/nginx_client_body"
+ "--http-proxy-temp-path=/tmp/nginx_proxy"
+ "--http-fastcgi-temp-path=/tmp/nginx_fastcgi"
+ "--http-uwsgi-temp-path=/tmp/nginx_uwsgi"
+ "--http-scgi-temp-path=/tmp/nginx_scgi"
] ++ optionals withDebug [
"--with-debug"
] ++ optionals withKTLS [
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index f7585e180a0a..71b144a21b34 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
- version = "0.20.2271";
+ version = "0.20.2291";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "Sngvd9OWCB2I0qfYvb7yEGb7HiWuHtc+jU6O5r68mbU=";
+ sha256 = "cJ+muM6dv7pgV1uKsvZuodghi7Y1K5HQKt9ZcIrYLmw=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix
index b9cecd3b3492..3eed49ff5ea7 100644
--- a/pkgs/servers/krill/default.nix
+++ b/pkgs/servers/krill/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "krill";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- hash = "sha256-0b8db5WYYHean+Ra2KNrLJcv5p7ofClX7So9qwhz6WQ=";
+ hash = "sha256-U74x6zEQS/3JjzIeYlosqISZoZM7cOMcheJKtRYnPyo=";
};
- cargoSha256 = "sha256-Ju71IyID6ZcKpU1RGJtwj4niORsnUaRfDfJArptjCF4=";
+ cargoSha256 = "sha256-CH97R9VGT7SFdJs6kWDIdOaV5Q6FtOPZ1tKcmI+zRgE=";
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index d52eade028b7..468df32bbddd 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -9,11 +9,11 @@ let
python = python3.override {
packageOverrides = self: super: {
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
- version = "1.26.0a5";
+ version = "1.27.0a1";
pname = "tulir-telethon";
src = super.fetchPypi {
inherit pname version;
- sha256 = "sha256-s6pj9kHqcl6XU1KQ/aOw1XWQ3CyDotaDl0m7aj9SbW4=";
+ sha256 = "sha256-tABAY4UlTyMK1ZafIFawegjBAtcnq3HMNbE1L6WaT3E=";
};
doCheck = false;
});
@@ -21,23 +21,18 @@ let
};
in python.pkgs.buildPythonPackage rec {
pname = "mautrix-telegram";
- version = "0.12.1";
+ version = "0.12.2";
disabled = python.pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mautrix";
repo = "telegram";
rev = "v${version}";
- sha256 = "sha256-ecNcoNz++HtuDZnDLsXfPL0MRF+XMQ1BU/NFkKPbD5U=";
+ sha256 = "sha256-htCk0VLr6GfXbpYWF/2bmpko7gSVlkH6HwDjOMhW8is=";
};
patches = [ ./0001-Re-add-entrypoint.patch ];
- postPatch = ''
- substituteInPlace requirements.txt \
- --replace "asyncpg>=0.20,<0.27" "asyncpg>=0.20"
- '';
-
propagatedBuildInputs = with python.pkgs; ([
ruamel-yaml
python-magic
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index ec248e45f3e2..879f2fa7d192 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.44.3";
+ version = "0.44.5";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
- hash = "sha256-74/G0SJRvyBiIIsCgh9LlINF6MS5UrCKmnfTKPLIpr0=";
+ hash = "sha256-YFFUPWFVHrHpY/QT0IlJv5PGtms6RuE5Wp17CQNG/Aw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix
index 4e85ff5f736c..a74068fdb4b0 100644
--- a/pkgs/servers/misc/oven-media-engine/default.nix
+++ b/pkgs/servers/misc/oven-media-engine/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "oven-media-engine";
- version = "0.14.14";
+ version = "0.14.16";
src = fetchFromGitHub {
owner = "AirenSoft";
repo = "OvenMediaEngine";
rev = "v${version}";
- sha256 = "sha256-ur3CnkIOtGRJJKfYIrlJ6bqkO06C6unizCUb9Ea9nGI=";
+ sha256 = "sha256-c9DyjVQ/s0bWueTFrNNoknhZhirrdLSkV6qTOqKk6GQ=";
};
sourceRoot = "source/src";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index effb2ab90792..7c880509d779 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "snmp_exporter";
- version = "0.20.0";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "snmp_exporter";
rev = "v${version}";
- sha256 = "0qwbnx3l25460qbah4ik9mlcyrm31rwm51451gh0jprii80cf16x";
+ sha256 = "sha256-ko2PApbz8kL0n6IEsRKLwMq9WmAdvfwI6o7ZH/BTd6c=";
};
- vendorSha256 = "1rivil3hwk269ikrwc4i22k2y5c9zs5ac058y7llz8ivrrjr2w4h";
+ vendorSha256 = "sha256-nbJXiZ+vHN/EnvAPTJUKotCE+nwdrXtWHhGfugm+CQQ=";
buildInputs = [ net-snmp ];
diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix
index b035169628a4..cf772770ede3 100644
--- a/pkgs/servers/mqtt/nanomq/default.nix
+++ b/pkgs/servers/mqtt/nanomq/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtls, sqlite }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "nanomq";
- version = "0.13.1";
+ version = "0.13.6";
src = fetchFromGitHub {
owner = "emqx";
repo = "nanomq";
- rev = version;
- hash = "sha256-FJhM1IdS6Ee54JJqJXpvp0OcTJJo2NaB/uP8w3mf/Yw=";
+ rev = finalAttrs.version;
+ hash = "sha256-CZxUDuuXuC2MqiJZiJ/JwlORou6OXeuSieLG4LAnhuA=";
fetchSubmodules = true;
};
@@ -33,4 +33,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix
index 52c26b780a20..e20381a33845 100644
--- a/pkgs/servers/nats-server/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nats-server";
- version = "2.9.7";
+ version = "2.9.8";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HsVJ5F0vOWeJoIXwWQEiYDZdKVqUL5enH7LNEkC0DTM=";
+ sha256 = "sha256-yJF5azPsTw6DN2c7Rf3cAeydaQh2kxqniEasPgkRS/E=";
};
vendorSha256 = "sha256-ASLy0rPuCSYGyy5Pw9fj559nxO4vPPagDKAe8wM29lo=";
diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix
index f8e3dfbc01c9..05d2a97a0e6e 100644
--- a/pkgs/servers/pinnwand/default.nix
+++ b/pkgs/servers/pinnwand/default.nix
@@ -7,24 +7,16 @@
with python3.pkgs; buildPythonApplication rec {
pname = "pinnwand";
- version = "1.3.0";
+ version = "1.4.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "supakeen";
repo = pname;
- rev = "v${version}";
- sha256 = "046xk2y59wa0pdp7s3hp1gh8sqdw0yl4xab22r2x44iwwcyb0gy5";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-zJH2ojLQChElRvU2TWg4lW+Mey+wP0XbLJhVF16nvss=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'click = "^7.0"' 'click = "*"' \
- --replace 'docutils = "^0.16"' 'docutils = "*"' \
- --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' \
- --replace 'token-bucket = "^0.2.0"' 'token-bucket = "*"'
- '';
-
nativeBuildInputs = [
poetry-core
];
@@ -36,15 +28,12 @@ with python3.pkgs; buildPythonApplication rec {
pygments-better-html
sqlalchemy
token-bucket
- toml
+ tomli
tornado
];
- checkInputs = [ pytestCheckHook ];
-
- disabledTests = [
- # pygments renamed rst to restructuredText, hence a mismatch on this test
- "test_guess_language"
+ checkInputs = [
+ pytestCheckHook
];
__darwinAllowLocalNetworking = true;
@@ -52,9 +41,10 @@ with python3.pkgs; buildPythonApplication rec {
passthru.tests = nixosTests.pinnwand;
meta = with lib; {
+ changelog = "https://github.com/supakeen/pinnwand/releases/tag/v${version}";
+ description = "A Python pastebin that tries to keep it simple";
homepage = "https://supakeen.com/project/pinnwand/";
license = licenses.mit;
- description = "A Python pastebin that tries to keep it simple";
maintainers = with maintainers; [ hexa ];
};
}
diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix
index a76184281762..b06fbd16e889 100644
--- a/pkgs/servers/snappymail/default.nix
+++ b/pkgs/servers/snappymail/default.nix
@@ -2,11 +2,11 @@
, dataPath ? "/var/lib/snappymail" }:
stdenv.mkDerivation rec {
pname = "snappymail";
- version = "2.21.4";
+ version = "2.22.3";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
- sha256 = "sha256-NxE3weZRI06scDZHSL5QjL+boc0GVffHCTzBxncBIuU=";
+ sha256 = "sha256-NznRHgBHapuuDxTWzD6xW+x1tu9TIdQ4mXFYDIhR1y0=";
};
sourceRoot = "snappymail";
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 8dbf9a385a8a..02bb13f5f7e3 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
+{ lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }:
let
- version = "4.0.4";
+ version = "4.0.5";
versionParts = lib.take 2 (lib.splitVersion version);
# 4.2 -> 402, 3.11 -> 311
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
- sha256 = "sha256-mwfUTMjNj9BKqIFezaekUtR9lwAMmsHaAUt6rkqfW8k=";
+ sha256 = "sha256-m4LyAg/C/ZV3nBD4gNFNjwI6glg7ZAH2nSGg0mU2DsI=";
};
phpConfig = writeText "config.php" ''
@@ -56,6 +56,10 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
+ passthru.tests = {
+ inherit (nixosTests) moodle;
+ };
+
meta = with lib; {
description =
"Free and open-source learning management system (LMS) written in PHP";
diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 3d65fe463148..0026e5bdbcf1 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -4,24 +4,16 @@ with python3Packages;
toPythonModule (buildPythonApplication rec {
pname = "searx";
- version = "1.0.0";
+ version = "1.1.0";
# pypi doesn't receive updates
src = fetchFromGitHub {
owner = "searx";
repo = "searx";
rev = "v${version}";
- sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
+ sha256 = "sha256-+Wsg1k/h41luk5aVfSn11/lGv8hZYVvpHLbbYHfsExw=";
};
- patches = [
- # Fix a crash, remove with the next update
- (fetchpatch {
- url = "https://github.com/searx/searx/commit/9c10b150963babb7f0b52081693a42b2e61eede9.patch";
- sha256 = "0svp8799628wja2hq59da6rxqi99am8p6hb8y27ciwzsjz0wwba7";
- })
- ];
-
postPatch = ''
sed -i 's/==.*$//' requirements.txt
'';
@@ -50,6 +42,7 @@ toPythonModule (buildPythonApplication rec {
pyyaml
requests
speaklater
+ setproctitle
werkzeug
];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index baf968fe309f..55bc9998fdee 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -963,7 +963,9 @@ self: super:
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.xauth ]
++ lib.optionals isDarwin [ xorg.libX11 xorg.xorgproto ];
postFixup = ''
- substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc
+ substituteInPlace $out/bin/startx \
+ --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc \
+ --replace $out/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc
'';
});
diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix
new file mode 100644
index 000000000000..01dc6874cc46
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-forgit/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, git, fzf }:
+
+stdenv.mkDerivation rec {
+ pname = "zsh-forgit";
+ version = "22.11.0";
+
+ src = fetchFromGitHub {
+ owner = "wfxr";
+ repo = "forgit";
+ rev = version;
+ sha256 = "ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=";
+ };
+
+ strictDeps = true;
+
+ postPatch = ''
+ substituteInPlace forgit.plugin.zsh \
+ --replace "fzf " "${fzf}/bin/fzf " \
+ --replace "git " "${git}/bin/git "
+ '';
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/wfxr/forgit";
+ description = "A utility tool powered by fzf for using git interactively";
+ license = licenses.mit;
+ maintainers = with maintainers; [ deejayem ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 87f601d4b4b0..10e942e847c4 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.120.0";
+ version = "0.121.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-XrXT+SivZ240lSiCWmxB4N4miI6xYojqLVmDJbhhWko=";
+ sha256 = "sha256-PeUmOFtsca8SLeHHOjYVJURAsbWpLWNfSEPUXYsQhSE=";
};
vendorSha256 = "sha256-S1gnnhI0U7OLd6vEW5qpxGAiOdORYWsEst11Vfj6pdI=";
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 07cf28cef537..d892f6d0ceed 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -14,16 +14,16 @@
buildGoModule rec {
pname = "pulumi";
- version = "3.47.2";
+ version = "3.48.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-Px1PPCnVNHTMdKyj1kwdfdsc+Hpuqwcnsin0+tPNtfU=";
+ hash = "sha256-8lHNcRYvKa9CJDWe4g4h24TY6mwfYfyQwBcQ4cY/tdQ=";
};
- vendorSha256 = "sha256-cijM5R2Z/g3MJPOYDIeLSqTuVJvIKQbun+26FWHn2AI=";
+ vendorSha256 = "sha256-igZfXUrYA6m42WrBQkQYyGe5p9C8h66Hkezf9a1XFo0=";
sourceRoot = "source/pkg";
diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix
index 57c46ce6cfdf..79da94f72435 100644
--- a/pkgs/tools/audio/kaldi/default.nix
+++ b/pkgs/tools/audio/kaldi/default.nix
@@ -25,19 +25,18 @@ let
in
stdenv.mkDerivation {
pname = "kaldi";
- version = "2021-12-03";
+ version = "unstable-2022-09-26";
src = fetchFromGitHub {
owner = "kaldi-asr";
repo = "kaldi";
- rev = "2b016ab8cb018e031ab3bf01ec36cc2950c7e509";
- sha256 = "sha256-R8CrY7cwU5XfeGEgeFuZ0ApsEcEmWN/lrZaCjz85tyk=";
+ rev = "f6f4ccaf213f0fe8b26e633a7dc0c802150626a0";
+ sha256 = "sha256-ybW2J4lWf6YaQGZZvxEVDUMAg84DC17W+yX6ZsuBDac=";
};
cmakeFlags = [
"-DKALDI_BUILD_TEST=off"
"-DBUILD_SHARED_LIBS=on"
- ] ++ lib.optionals stdenv.isDarwin [
"-DBLAS_LIBRARIES=-lblas"
"-DLAPACK_LIBRARIES=-llapack"
];
@@ -71,6 +70,8 @@ stdenv.mkDerivation {
export PATH=$(pwd)/bin:$PATH
'';
+ outputs = [ "out" "dev" ];
+
buildInputs = [
openblas
openfst
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index aff00402ed97..c556f31e6918 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ucl, zlib, perl }:
+{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }:
stdenv.mkDerivation rec {
pname = "upx";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
buildInputs = [ ucl zlib perl ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch";
+ sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M=";
+ name = "CVE-2021-20285.patch";
+ })
+ ];
+
preConfigure = ''
export UPX_UCLDIR=${ucl}
'';
diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix
deleted file mode 100644
index 836b94dc7954..000000000000
--- a/pkgs/tools/filesystems/fsfs/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{lib, stdenv, fetchurl, openssl, fuse}:
-
-throw "It still does not build"
-
-stdenv.mkDerivation rec {
- pname = "fsfs";
- version = "0.1.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz";
- sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74";
- };
-
- buildInputs = [ fuse openssl ];
-
- patchPhase = ''
- sed -i -e 's,CONFDIR=\(.*\),CONFDIR='$out/etc, \
- -e 's,USERCONFPREFIX=\(.*\),USERCONFPREFIX='$out/var/lib, Makefile \
- src/Makefile src/utils/Makefile
- '';
-
- preInstall = ''
- mkdir -p $out/etc $out/var/lib
- makeFlags="$makeFlags prefix=$out"
- '';
-
- meta = {
- homepage = "http://fsfs.sourceforge.net/";
- description = "Secure distributed file system in user space";
- license = lib.licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 018621b8019a..56d6bdc7fba2 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "ntfs3g";
- version = "2022.5.17";
+ version = "2022.10.3";
outputs = [ "out" "dev" "man" "doc" ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "tuxera";
repo = "ntfs-3g";
rev = version;
- sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ=";
+ sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
};
buildInputs = [ gettext libuuid ]
diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix
index 066bc0b0d1d7..23b1601a8502 100644
--- a/pkgs/tools/filesystems/stratis-cli/default.nix
+++ b/pkgs/tools/filesystems/stratis-cli/default.nix
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "stratis-cli";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "stratis-storage";
repo = pname;
- rev = "refs/tags/v${version}";
- hash = "sha256-tS9kjXE7wn5j13PO8c3C98MpFbgmR4le/PNKoXKPKQg=";
+ rev = "v${version}";
+ hash = "sha256-kB8saMgNIoDCXhxCPG1Mwj7dxrev82leoewajA5g9IM=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix
index 68023a1265e7..3b6b3d8bafd3 100644
--- a/pkgs/tools/filesystems/stratisd/default.nix
+++ b/pkgs/tools/filesystems/stratisd/default.nix
@@ -24,18 +24,18 @@
stdenv.mkDerivation rec {
pname = "stratisd";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "stratis-storage";
repo = pname;
rev = "v${version}";
- hash = "sha256-6CCSs359gPwUMQ2SFpxaWHXCjqqgIbvCaPL2zLuYRKg=";
+ hash = "sha256-SHrD9zzGLGSlsf4UOqp4Xday6IDnryVDHIVRiPbE5CM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- hash = "sha256-9nE/SFGv1tYyGDdemCahxHlRnLms3eK0r4XQMhQBjSQ=";
+ hash = "sha256-lkuFWVmO+qw2ZXbCwdhU5OpRZy589QKnudgNVTgsJhI=";
};
postPatch = ''
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
EXECUTABLES_PATHS = lib.makeBinPath ([
xfsprogs
thin-provisioning-tools
- udev
] ++ lib.optionals clevisSupport [
clevis
jose
diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix
index 59a2edf41544..2165390744c4 100644
--- a/pkgs/tools/misc/apkeep/default.nix
+++ b/pkgs/tools/misc/apkeep/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "apkeep";
- version = "0.13.0";
+ version = "0.14.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-wFrpzemqBdhEO8cahSV9Qjw4HxCk+TgAVpGaa/IaO0Q=";
+ sha256 = "sha256-ikI178fExFHYapg95NKtMxKT/4mXfVH+Jvaw8i1pSu4=";
};
- cargoSha256 = "sha256-6DAzNiNHmzOwg7RlRCorUCW33FTYdfLf6PnTygcL1ok=";
+ cargoSha256 = "sha256-hA/GIj5MunflLlwa0S4o4EEr6Us+34dgYAAc43C6EXo=";
prePatch = ''
rm .cargo/config.toml
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 690e69b80642..057ba28ff061 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -5,7 +5,7 @@
, catch2
, clasp
, cmake
-, gringo
+, clingo
, re2c
}:
@@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost clasp gringo re2c ];
+ buildInputs = [ boost clasp clingo re2c ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
- "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo"
+ "-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo"
"-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
];
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index a214a210d78f..607db114d9fb 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -2,7 +2,7 @@
, python3
, fetchFromGitHub
, platformio
-, esptool
+, esptool_3
, git
}:
@@ -66,7 +66,7 @@ with python.pkgs; buildPythonApplication rec {
# platformio is used in esphomeyaml/platformio_api.py
# esptool is used in esphomeyaml/__main__.py
# git is used in esphomeyaml/writer.py
- "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
+ "--prefix PATH : ${lib.makeBinPath [ platformio esptool_3 git ]}"
"--set ESPHOME_USE_SUBPROCESS ''"
];
diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix
new file mode 100644
index 000000000000..3ffa79b8c8bb
--- /dev/null
+++ b/pkgs/tools/misc/esptool/3.nix
@@ -0,0 +1,63 @@
+{ lib, fetchFromGitHub, python3, openssl }:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "esptool";
+ version = "3.3.2";
+
+ src = fetchFromGitHub {
+ owner = "espressif";
+ repo = "esptool";
+ rev = "v${version}";
+ hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM=";
+ };
+
+ postPatch = ''
+ substituteInPlace test/test_imagegen.py \
+ --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY"
+ '';
+
+ propagatedBuildInputs = with python3.pkgs; [
+ bitstring
+ cryptography
+ ecdsa
+ pyserial
+ reedsolo
+ ];
+
+ # wrapPythonPrograms will overwrite esptool.py with a bash script,
+ # but espefuse.py tries to import it. Since we don't add any binary paths,
+ # use patchPythonScript directly.
+ dontWrapPythonPrograms = true;
+ postFixup = ''
+ buildPythonPath "$out $pythonPath"
+ for f in $out/bin/*.py; do
+ echo "Patching $f"
+ patchPythonScript "$f"
+ done
+ '';
+
+ checkInputs = with python3.pkgs; [
+ pyelftools
+ ];
+
+ # tests mentioned in `.github/workflows/test_esptool.yml`
+ checkPhase = ''
+ runHook preCheck
+
+ export ESPTOOL_PY=$out/bin/esptool.py
+ ${python3.interpreter} test/test_imagegen.py
+ ${python3.interpreter} test/test_espsecure.py
+ ${python3.interpreter} test/test_merge_bin.py
+ ${python3.interpreter} test/test_modules.py
+
+ runHook postCheck
+ '';
+
+ meta = with lib; {
+ description = "ESP8266 and ESP32 serial bootloader utility";
+ homepage = "https://github.com/espressif/esptool";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ hexa ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index e48e02694052..609c5d74c79e 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -1,20 +1,22 @@
-{ lib, fetchFromGitHub, python3, openssl }:
+{ lib
+, fetchFromGitHub
+, python3
+}:
python3.pkgs.buildPythonApplication rec {
pname = "esptool";
- version = "3.3.1";
+ version = "4.4";
src = fetchFromGitHub {
owner = "espressif";
repo = "esptool";
rev = "v${version}";
- hash = "sha256-9WmiLji7Zoad5WIzgkpvkI9t96sfdkCtFh6zqVxF7qo=";
+ hash = "sha256-haLwf3loOvqdqQN/iuVBciQ6nCnuc9AqqOGKvDwLBHE=";
};
- postPatch = ''
- substituteInPlace test/test_imagegen.py \
- --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY"
- '';
+ patches = [
+ ./test-call-bin-directly.patch
+ ];
propagatedBuildInputs = with python3.pkgs; [
bitstring
@@ -24,26 +26,16 @@ python3.pkgs.buildPythonApplication rec {
reedsolo
];
- # wrapPythonPrograms will overwrite esptool.py with a bash script,
- # but espefuse.py tries to import it. Since we don't add any binary paths,
- # use patchPythonScript directly.
- dontWrapPythonPrograms = true;
- postFixup = ''
- buildPythonPath "$out $pythonPath"
- for f in $out/bin/*.py; do
- echo "Patching $f"
- patchPythonScript "$f"
- done
- '';
-
checkInputs = with python3.pkgs; [
pyelftools
+ pytest
];
# tests mentioned in `.github/workflows/test_esptool.yml`
checkPhase = ''
runHook preCheck
+ export ESPSECURE_PY=$out/bin/espsecure.py
export ESPTOOL_PY=$out/bin/esptool.py
${python3.interpreter} test/test_imagegen.py
${python3.interpreter} test/test_espsecure.py
diff --git a/pkgs/tools/misc/esptool/test-call-bin-directly.patch b/pkgs/tools/misc/esptool/test-call-bin-directly.patch
new file mode 100644
index 000000000000..b7d772780090
--- /dev/null
+++ b/pkgs/tools/misc/esptool/test-call-bin-directly.patch
@@ -0,0 +1,89 @@
+diff --git a/test/test_espsecure.py b/test/test_espsecure.py
+index 25b0b87..627005c 100755
+--- a/test/test_espsecure.py
++++ b/test/test_espsecure.py
+@@ -35,7 +35,7 @@ class EspSecureTestCase:
+ Returns output as a string if there is any,
+ raises an exception if espsecure.py fails
+ """
+- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
++ cmd = [ESPSECURE_PY] + args.split(" ")
+ print("\nExecuting {}...".format(" ".join(cmd)))
+
+ try:
+diff --git a/test/test_esptool.py b/test/test_esptool.py
+index 042a1ce..b294e26 100755
+--- a/test/test_esptool.py
++++ b/test/test_esptool.py
+@@ -57,7 +57,10 @@ try:
+ ESPTOOL_PY = os.environ["ESPTOOL_PY"]
+ except KeyError:
+ ESPTOOL_PY = os.path.join(TEST_DIR, "..", "esptool/__init__.py")
+-ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
++try:
++ ESPSECURE_PY = os.environ["ESPSECURE_PY"]
++except KeyError:
++ ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py")
+ ESPRFC2217SERVER_PY = os.path.join(TEST_DIR, "..", "esp_rfc2217_server.py")
+
+ RETURN_CODE_FATAL_ERROR = 2
+@@ -74,7 +77,6 @@ class ESPRFC2217Server(object):
+ def __init__(self, rfc2217_port=None):
+ self.port = rfc2217_port or self.get_free_port()
+ self.cmd = [
+- sys.executable,
+ ESPRFC2217SERVER_PY,
+ "-p",
+ str(self.port),
+@@ -130,7 +132,7 @@ class ESPRFC2217Server(object):
+ class EsptoolTestCase:
+ def run_espsecure(self, args):
+
+- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ")
++ cmd = [ESPSECURE_PY] + args.split(" ")
+ print("\nExecuting {}...".format(" ".join(cmd)))
+ try:
+ output = subprocess.check_output(
+@@ -155,7 +157,7 @@ class EsptoolTestCase:
+ Raises an exception if esptool.py fails.
+ """
+ trace_args = ["--trace"] if arg_trace else []
+- cmd = [sys.executable, ESPTOOL_PY] + trace_args
++ cmd = [ESPTOOL_PY] + trace_args
+ if chip_name or arg_chip is not None and chip_name != "auto":
+ cmd += ["--chip", chip_name or arg_chip]
+ if rfc2217_port or arg_port is not None:
+diff --git a/test/test_imagegen.py b/test/test_imagegen.py
+index a1feec2..01bd59c 100755
+--- a/test/test_imagegen.py
++++ b/test/test_imagegen.py
+@@ -108,7 +108,7 @@ class BaseTestCase:
+ Run esptool.py image_info on a binary file,
+ assert no red flags about contents.
+ """
+- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "image_info", binpath]
++ cmd = [ESPTOOL_PY, "--chip", chip, "image_info", binpath]
+ try:
+ output = subprocess.check_output(cmd)
+ output = output.decode("utf-8")
+@@ -123,7 +123,7 @@ class BaseTestCase:
+
+ def run_elf2image(self, chip, elf_path, version=None, extra_args=[]):
+ """Run elf2image on elf_path"""
+- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "elf2image"]
++ cmd = [ESPTOOL_PY, "--chip", chip, "elf2image"]
+ if version is not None:
+ cmd += ["--version", str(version)]
+ cmd += [elf_path] + extra_args
+diff --git a/test/test_merge_bin.py b/test/test_merge_bin.py
+index 8230069..2df5f8c 100755
+--- a/test/test_merge_bin.py
++++ b/test/test_merge_bin.py
+@@ -39,7 +39,6 @@ class TestMergeBin:
+ output_file.close()
+
+ cmd = [
+- sys.executable,
+ ESPTOOL_PY,
+ "--chip",
+ chip,
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index 651d9012e005..c6f6c729be66 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,79 +1,84 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
aws-eventstream (1.2.0)
- aws-partitions (1.540.0)
- aws-sdk-cloudwatchlogs (1.49.0)
- aws-sdk-core (~> 3, >= 3.122.0)
+ aws-partitions (1.661.0)
+ aws-sdk-cloudwatchlogs (1.56.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.124.0)
+ aws-sdk-core (3.167.0)
aws-eventstream (~> 1, >= 1.0.2)
- aws-partitions (~> 1, >= 1.525.0)
+ aws-partitions (~> 1, >= 1.651.0)
+ aws-sigv4 (~> 1.5)
+ jmespath (~> 1, >= 1.6.1)
+ aws-sdk-firehose (1.49.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- jmespath (~> 1.0)
- aws-sdk-firehose (1.45.0)
- aws-sdk-core (~> 3, >= 3.122.0)
+ aws-sdk-kinesis (1.42.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kinesis (1.38.0)
- aws-sdk-core (~> 3, >= 3.122.0)
+ aws-sdk-kms (1.59.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kms (1.52.0)
- aws-sdk-core (~> 3, >= 3.122.0)
- aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.109.0)
- aws-sdk-core (~> 3, >= 3.122.0)
+ aws-sdk-s3 (1.117.1)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-sqs (1.48.0)
- aws-sdk-core (~> 3, >= 3.122.0)
+ aws-sdk-sqs (1.52.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.4.0)
+ aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
- bson (4.12.1)
- concurrent-ruby (1.1.9)
+ bson (4.15.0)
+ concurrent-ruby (1.1.10)
cool.io (1.7.1)
digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
- elasticsearch (7.16.0)
- elasticsearch-api (= 7.16.0)
- elasticsearch-transport (= 7.16.0)
- elasticsearch-api (7.16.0)
+ elastic-transport (8.1.0)
+ faraday (< 3)
multi_json
- elasticsearch-transport (7.16.0)
- faraday (~> 1)
+ elasticsearch (8.5.1)
+ elastic-transport (~> 8)
+ elasticsearch-api (= 8.5.1)
+ elasticsearch-api (8.5.1)
multi_json
- excon (0.89.0)
- faraday (1.8.0)
+ excon (0.94.0)
+ faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
- faraday-httpclient (~> 1.0.1)
+ faraday-httpclient (~> 1.0)
+ faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
- faraday-net_http_persistent (~> 1.1)
+ faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
- multipart-post (>= 1.2, < 3)
+ faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
+ faraday-multipart (1.0.4)
+ multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
+ faraday-retry (1.0.3)
fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2)
- fluent-plugin-cloudwatch-logs (0.14.2)
+ fluent-plugin-cloudwatch-logs (0.14.3)
aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 1.8.0)
- fluent-plugin-elasticsearch (5.1.4)
+ fluent-plugin-elasticsearch (5.2.4)
elasticsearch
excon
+ faraday (~> 1.10)
fluentd (>= 0.14.22)
- fluent-plugin-kafka (0.17.3)
+ fluent-plugin-kafka (0.18.1)
fluentd (>= 0.10.58, < 2)
ltsv
ruby-kafka (>= 1.4.0, < 2)
@@ -82,59 +87,59 @@ GEM
aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14)
fluentd (>= 0.14.22, < 2)
google-protobuf (~> 3)
- fluent-plugin-mongo (1.5.0)
+ fluent-plugin-mongo (1.6.0)
fluentd (>= 0.14.22, < 2)
- mongo (~> 2.6.0)
+ mongo (>= 2.15.0, < 2.19.0)
fluent-plugin-record-reformer (0.9.1)
fluentd
fluent-plugin-rewrite-tag-filter (2.4.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
- fluent-plugin-s3 (1.6.1)
+ fluent-plugin-s3 (1.7.2)
aws-sdk-s3 (~> 1.60)
aws-sdk-sqs (~> 1.23)
fluentd (>= 0.14.22, < 2)
fluent-plugin-webhdfs (1.5.0)
fluentd (>= 0.14.22)
webhdfs (>= 0.10.0)
- fluentd (1.14.3)
+ fluentd (1.15.3)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
msgpack (>= 1.3.1, < 2.0.0)
- serverengine (>= 2.2.2, < 3.0.0)
+ serverengine (>= 2.3.0, < 3.0.0)
sigdump (~> 0.2.2)
strptime (>= 0.2.4, < 1.0.0)
tzinfo (>= 1.0, < 3.0)
tzinfo-data (~> 1.0)
webrick (>= 1.4.2, < 1.8.0)
yajl-ruby (~> 1.0)
- google-protobuf (3.19.1)
+ google-protobuf (3.21.9)
http_parser.rb (0.8.0)
- jmespath (1.4.0)
+ jmespath (1.6.1)
ltsv (0.1.2)
- mongo (2.6.4)
- bson (>= 4.3.0, < 5.0.0)
- msgpack (1.4.2)
+ mongo (2.18.1)
+ bson (>= 4.14.1, < 5.0.0)
+ msgpack (1.6.0)
multi_json (1.15.0)
- multipart-post (2.1.1)
- public_suffix (4.0.6)
+ multipart-post (2.2.3)
+ public_suffix (5.0.0)
rake (13.0.6)
- ruby-kafka (1.4.0)
+ ruby-kafka (1.5.0)
digest-crc
ruby2_keywords (0.0.5)
- serverengine (2.2.4)
+ serverengine (2.3.0)
sigdump (~> 0.2.2)
sigdump (0.2.4)
strptime (0.2.5)
- tzinfo (2.0.4)
+ tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
- tzinfo-data (1.2021.5)
+ tzinfo-data (1.2022.6)
tzinfo (>= 1.0.0)
webhdfs (0.10.2)
addressable
webrick (1.7.0)
- yajl-ruby (1.4.1)
+ yajl-ruby (1.4.3)
PLATFORMS
ruby
@@ -152,4 +157,4 @@ DEPENDENCIES
fluentd
BUNDLED WITH
- 2.2.24
+ 2.3.24
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 10e2b1678f1e..d6d2ea5fbe47 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+ sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
type = "gem";
};
- version = "2.8.0";
+ version = "2.8.1";
};
aws-eventstream = {
groups = ["default"];
@@ -25,10 +25,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ns0378h8qa5vwrq7a7i0xji17japs95mddpvam351k19a79vbwh";
+ sha256 = "15bw7jm2n7kxjz65amg9s837zlxsf98fn6wf6x20ngz1x4i8n0j6";
type = "gem";
};
- version = "1.540.0";
+ version = "1.661.0";
};
aws-sdk-cloudwatchlogs = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "075qkjzjbi37hnp4qq9gkxy2cfb9v29c66qclfmxqyvfcw5s04b1";
+ sha256 = "1iy8r65hwqlqaifhv7yxwapizrf02ch800xl90i9vg9293p5545w";
type = "gem";
};
- version = "1.49.0";
+ version = "1.56.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1chpydvgwa48rbd67k39fpg2vjp21v3kmjygbjqv1l1sqn6rjbvw";
+ sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
type = "gem";
};
- version = "3.124.0";
+ version = "3.167.0";
};
aws-sdk-firehose = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01vf0xzyj1j85vvl16mhazkgs5zz9ym6rk5v7396mlzm8a67796g";
+ sha256 = "0vhrld6gpa8idw51qfpvy2d624jbwmvickpfr8bnb4a5b06im80a";
type = "gem";
};
- version = "1.45.0";
+ version = "1.49.0";
};
aws-sdk-kinesis = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -69,10 +69,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xgjmpm2k60sl734g6lv7g8qlm4d6g9pjzgr1825fhd1h492p3dl";
+ sha256 = "0n6jdkcyh9cm4f15zmmgpzwxbal5dg2w17xcm65d1gf9dwajsjda";
type = "gem";
};
- version = "1.38.0";
+ version = "1.42.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -80,10 +80,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1br4h5zwb5ir2bf6y0hnlwafkmghxi2fbjqx86agyv838ndy9npd";
+ sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
type = "gem";
};
- version = "1.52.0";
+ version = "1.59.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -91,10 +91,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yc96imi4v043rdxa94ncg15aapzp1i5qx076rv25zxqcbkdwzwd";
+ sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
type = "gem";
};
- version = "1.109.0";
+ version = "1.117.1";
};
aws-sdk-sqs = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -102,10 +102,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vzff2v18098cz8c6pvgfh1lc4l1kk4w5gq76rwjdxw2ahnxf4h9";
+ sha256 = "1jf878ncdkxz3z507pa2fl47h2a9yvi01cx2pg3camqmal1nd1x7";
type = "gem";
};
- version = "1.48.0";
+ version = "1.52.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -113,30 +113,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
+ sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
type = "gem";
};
- version = "1.4.0";
+ version = "1.5.2";
};
bson = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc";
+ sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk";
type = "gem";
};
- version = "4.12.1";
+ version = "4.15.0";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
- version = "1.1.9";
+ version = "1.1.10";
};
"cool.io" = {
groups = ["default"];
@@ -159,16 +159,27 @@
};
version = "0.6.4";
};
- elasticsearch = {
- dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+ elastic-transport = {
+ dependencies = ["faraday" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06vyavz2lcswj32jdcnjccax3flpcb2xnx9f5jxxm95clkpsqnwa";
+ sha256 = "0w5l26fwyby8pjcyyap015q5lxc619j8ig6af5slbp9l2x7kjaby";
type = "gem";
};
- version = "7.16.0";
+ version = "8.1.0";
+ };
+ elasticsearch = {
+ dependencies = ["elastic-transport" "elasticsearch-api"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19jbvm6rzm19vzd3d83icchs0l4qgh7kp3cfi4pd2lcfiy635qil";
+ type = "gem";
+ };
+ version = "8.5.1";
};
elasticsearch-api = {
dependencies = ["multi_json"];
@@ -176,42 +187,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vp09waa4bi1xk7ixwldiix27g52fd6xcij6826xgypmzrxrn1hc";
+ sha256 = "00b6lhfs4r9jp3dkphly9qqyyrd7sx4s1186kcjf8zhsxyq0m310";
type = "gem";
};
- version = "7.16.0";
- };
- elasticsearch-transport = {
- dependencies = ["faraday" "multi_json"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kpcy250crl9w1jspqw9ykv0ixlnscym93mi9kvgljis2yql0qlx";
- type = "gem";
- };
- version = "7.16.0";
+ version = "8.5.1";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih";
+ sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
type = "gem";
};
- version = "0.89.0";
+ version = "0.94.0";
};
faraday = {
- dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
+ sha256 = "1d5ipsv069dhgv9zhxgj8pz4j52yhgvfm01aq881yz7qgjd7ilxp";
type = "gem";
};
- version = "1.8.0";
+ version = "1.10.2";
};
faraday-em_http = {
groups = ["default"];
@@ -253,6 +253,17 @@
};
version = "1.0.1";
};
+ faraday-multipart = {
+ dependencies = ["multipart-post"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
+ type = "gem";
+ };
+ version = "1.0.4";
+ };
faraday-net_http = {
groups = ["default"];
platforms = [];
@@ -293,6 +304,16 @@
};
version = "1.0.0";
};
+ faraday-retry = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
fluent-config-regexp-type = {
dependencies = ["fluentd"];
groups = ["default"];
@@ -310,21 +331,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z1i1n921i5w43bl6rcsj526a22dzv6lrninwj8ygaksgrg5rr45";
+ sha256 = "139d7qv4my818mhjp0104ns9dlndlvrb6dgxa2rkv6jlzlamjpjb";
type = "gem";
};
- version = "0.14.2";
+ version = "0.14.3";
};
fluent-plugin-elasticsearch = {
- dependencies = ["elasticsearch" "excon" "fluentd"];
+ dependencies = ["elasticsearch" "excon" "faraday" "fluentd"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gfqpl2izz036faaz3qlq61da87avhmc2406s21shayhkf8sx0p9";
+ sha256 = "136nsmi15vcn0var59j1vqkysvmcp7y8fva25gkcx3hx1l92bxwh";
type = "gem";
};
- version = "5.1.4";
+ version = "5.2.4";
};
fluent-plugin-kafka = {
dependencies = ["fluentd" "ltsv" "ruby-kafka"];
@@ -332,10 +353,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15hdd140nqh9zg10wqdwp3m0k1l5w1xhllvbfs5z21aqwrvwc0mp";
+ sha256 = "1ggiq89brahyamnw4sn4pmfqsw8xjz2k9k9hajsjlzkm9djppdwf";
type = "gem";
};
- version = "0.17.3";
+ version = "0.18.1";
};
fluent-plugin-kinesis = {
dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"];
@@ -354,10 +375,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rpaglr8hka0prvj5xsrl1af3137c7ma1d1xf1mvib5k9h0aax1f";
+ sha256 = "1m3fa6fwpzxw08lnczsif5c7v33yryyvgb1lbp7a7qjhipvb6jfm";
type = "gem";
};
- version = "1.5.0";
+ version = "1.6.0";
};
fluent-plugin-record-reformer = {
dependencies = ["fluentd"];
@@ -387,10 +408,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "191j1y76irfgrsj259mj062izkfxrr5kajixdf17h26m3l9n5pgh";
+ sha256 = "04yvxhynjqm35dycrxqwfw9r7mv6ycyda1wvki27z5hpsdy57b1m";
type = "gem";
};
- version = "1.6.1";
+ version = "1.7.2";
};
fluent-plugin-webhdfs = {
dependencies = ["fluentd" "webhdfs"];
@@ -409,20 +430,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vrw0i286ssrr33g1zayqjk9fxmjz8a4xhrka0id2a9w3ncq275z";
+ sha256 = "1jn1i14zaw2pf4j6i7g7cj0h8j94wrcbn0an8w44h7g5mazl98nn";
type = "gem";
};
- version = "1.14.3";
+ version = "1.15.3";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53";
+ sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras";
type = "gem";
};
- version = "3.19.1";
+ version = "3.21.9";
};
"http_parser.rb" = {
groups = ["default"];
@@ -439,10 +460,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+ sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
- version = "1.4.0";
+ version = "1.6.1";
};
ltsv = {
groups = ["default"];
@@ -460,20 +481,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0k0f1826hixqfqgsc9g6rdqrzr5pzy46hszmk6869pmvm638jah1";
+ sha256 = "16dzacmhz4g4n4kmw9qfg7hjh4xj71rzb7nd7n8vl1788x9h3sp5";
type = "gem";
};
- version = "2.6.4";
+ version = "2.18.1";
};
msgpack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6";
+ sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";
type = "gem";
};
- version = "1.4.2";
+ version = "1.6.0";
};
multi_json = {
groups = ["default"];
@@ -490,20 +511,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+ sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6";
type = "gem";
};
- version = "2.1.1";
+ version = "2.2.3";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
type = "gem";
};
- version = "4.0.6";
+ version = "5.0.0";
};
rake = {
groups = ["default"];
@@ -521,10 +542,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bmp3nsf836z3392drhlfmhav2025k46yj8sbhphpphr22v3ka7k";
+ sha256 = "13i3fvjy0n1n1aa71b30nwx2xchhsps3yhi17r0s6ay7wr26jr7p";
type = "gem";
};
- version = "1.4.0";
+ version = "1.5.0";
};
ruby2_keywords = {
groups = ["default"];
@@ -542,10 +563,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gzhggx40a53mnv4f32xag4h6ai0s5m3w06s59b0h6ih7rqvwns9";
+ sha256 = "1snxfmkmmxpdica8629gdl6qj3xradcx787ccvhfa90gh8wyfqqj";
type = "gem";
};
- version = "2.2.4";
+ version = "2.3.0";
};
sigdump = {
groups = ["default"];
@@ -573,10 +594,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
+ sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem";
};
- version = "2.0.4";
+ version = "2.0.5";
};
tzinfo-data = {
dependencies = ["tzinfo"];
@@ -584,10 +605,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698";
+ sha256 = "0dpwi70x9jrpvc7p103ci0kppam79wqqrskq9n39r3jrp4b4j27w";
type = "gem";
};
- version = "1.2021.5";
+ version = "1.2022.6";
};
webhdfs = {
dependencies = ["addressable"];
@@ -615,9 +636,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
+ sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc";
type = "gem";
};
- version = "1.4.1";
+ version = "1.4.3";
};
}
diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix
deleted file mode 100644
index cbaa96110722..000000000000
--- a/pkgs/tools/misc/gringo/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, stdenv, fetchurl,
- bison, re2c, sconsPackages,
- libcxx, libcxxabi
-}:
-
-stdenv.mkDerivation rec {
- pname = "gringo";
- version = "4.5.4";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";
- sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
- };
-
- buildInputs = [ bison re2c sconsPackages.scons_3_1_2 ];
-
- patches = [
- ./gringo-4.5.4-cmath.patch
- ./gringo-4.5.4-to_string.patch
- ];
-
- postPatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace ./SConstruct \
- --replace \
- "env['CXX'] = 'g++'" \
- "env['CXX'] = '$CXX'"
-
- substituteInPlace ./SConstruct \
- --replace \
- "env['CPPPATH'] = []" \
- "env['CPPPATH'] = ['${lib.getDev libcxx}/include/c++/v1']"
-
- substituteInPlace ./SConstruct \
- --replace \
- "env['LIBPATH'] = []" \
- "env['LIBPATH'] = ['${lib.getLib libcxx}/lib', '${lib.getLib libcxxabi}/lib']"
- '' + ''
- sed '1i#include ' -i libgringo/gringo/{control,term}.hh
- '';
-
- buildPhase = ''
- scons WITH_PYTHON= --build-dir=release
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp build/release/gringo $out/bin/gringo
- '';
-
- meta = with lib; {
- description = "Converts input programs with first-order variables to equivalent ground programs";
- homepage = "http://potassco.sourceforge.net/";
- platforms = platforms.all;
- maintainers = [ maintainers.hakuch ];
- license = licenses.gpl3Plus;
- };
-}
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
deleted file mode 100644
index 7b5510e2344b..000000000000
--- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400
-+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400
-@@ -22,6 +22,8 @@
- #include "gringo/logger.hh"
- #include "gringo/graph.hh"
-
-+#include
-+
- namespace Gringo {
-
- // {{{ definition of Defines
diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
deleted file mode 100644
index b81eab4cd678..000000000000
--- a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400
-+++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500
-@@ -32,7 +32,7 @@
- #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
- #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter)
-
--#ifdef MISSING_STD_TO_STRING
-+#if 0
-
- #include
-
diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix
index 451a3581b40e..4b40b6131453 100644
--- a/pkgs/tools/misc/kak-lsp/default.nix
+++ b/pkgs/tools/misc/kak-lsp/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
- version = "14.0.0";
+ version = "14.1.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-RTz8BdbEiAY6wyIS18LZRQQ1DQzIRz2Bk7bOeMf7sT8=";
+ sha256 = "sha256-5eGp11qPLT1fen39bZmICReK2Ly8Kg9Y3g30ZV0gk04=";
};
- cargoSha256 = "sha256-fHVKm4DWhkwbbRGLvMfoEjJfM6VF7RW6x75NR7aNs7o=";
+ cargoSha256 = "sha256-+Sj+QSSXJAgGulMLRCWLgddVG8sIiHaB1xWPojVCgas=";
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix
index bea127acb008..8c7a8ffe3017 100644
--- a/pkgs/tools/misc/moar/default.nix
+++ b/pkgs/tools/misc/moar/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moar";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "walles";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-cFXUspVSCUy0q5CW8K+YL/LBpK87qlPys8hg6AYvg5M=";
+ sha256 = "sha256-I/VN2KCI38uADLpLAJbkhTU3AG40ECYVMAqLVajhsw0=";
};
vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I=";
@@ -19,6 +19,11 @@ buildGoModule rec {
installManPage ./moar.1
'';
+ ldflags = [
+ "-s" "-w"
+ "-X" "main.versionString=v${version}"
+ ];
+
meta = with lib; {
description = "Nice-to-use pager for humans";
homepage = "https://github.com/walles/moar";
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 3ef92d895a06..c0ef2a037db6 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -43,13 +43,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2022.6";
+ version = "2022.7";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "sha256-g170fZoLNaEMd//X8PvS4rh/fMy1iNonRCoF/3H/rYw=";
+ sha256 = "sha256-i+KpJhyU6LnsQRM4D/xID4WYJF+zIaAJutT65LgiQR8=";
};
patches = [
diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix
index 7d574586a8a3..c096d96d17ae 100644
--- a/pkgs/tools/misc/page/default.nix
+++ b/pkgs/tools/misc/page/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "page";
- version = "3.1.2";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "I60R";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-e6GkvIojMfsIm4UxRyEvvNkZPGSmUnf9K/0ZISy8kj4=";
+ sha256 = "sha256-w/6uCzBRXsmq7Khe+8ysfgBoxnWBLyRMyb43sCxNYMA=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
installShellCompletion --zsh $completions_dir/_page
'';
- cargoSha256 = "sha256-qyaHW4mbJXZ/iGQlIzmTo2dgPLC9JlPKBee+uAuW5PQ=";
+ cargoSha256 = "sha256-xHGlJxUpmqR+WoKURpRAJAhmmKXIO0SWg9VLFiinKfo=";
meta = with lib; {
description = "Use neovim as pager";
diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix
index 8059038327bb..44faa2342f93 100644
--- a/pkgs/tools/misc/piston-cli/default.nix
+++ b/pkgs/tools/misc/piston-cli/default.nix
@@ -3,6 +3,7 @@
python3Packages.buildPythonApplication rec {
pname = "piston-cli";
version = "1.4.3";
+ format = "pyproject";
src = python3Packages.fetchPypi {
inherit pname version;
@@ -15,6 +16,16 @@ python3Packages.buildPythonApplication rec {
$out/bin/piston --help > /dev/null
'';
+ nativeBuildInputs = with python3Packages; [
+ poetry-core
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'rich = "^10.1.0"' 'rich = "*"' \
+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = "*"'
+ '';
+
meta = with lib; {
broken = stdenv.isDarwin;
description = "Piston api tool";
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 28fc114ac646..df94b44a2bf7 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "5.5.12";
+ version = "5.5.13";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "sha256-HJ/uvaFdQMVpc+QPK3r3RYExFz85QUjrz1Y2kIaoIAU=";
+ sha256 = "sha256-49q4qyxX3oen0iNA3KijGnMtYGUQqgwpCrudQQjL/7g=";
};
nativeBuildInputs = [ pkg-config installShellFiles ];
diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix
new file mode 100644
index 000000000000..cb16a93dd207
--- /dev/null
+++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, nixosTests
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "sqlite3-to-mysql";
+ version = "1.4.16";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "techouse";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Fxt1zOyEnBuMkCLCABfijo0514NbFocdsjrQU43qVhY=";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ click
+ mysql-connector
+ pytimeparse
+ pymysql
+ pymysqlsa
+ six
+ simplejson
+ sqlalchemy
+ sqlalchemy-utils
+ tqdm
+ tabulate
+ unidecode
+ packaging
+ ];
+
+ # tests require a mysql server instance
+ doCheck = false;
+
+ # run package tests as a seperate nixos test
+ passthru.tests = {
+ nixosTest = nixosTests.sqlite3-to-mysql;
+ };
+
+
+ meta = with lib; {
+ description = "A simple Python tool to transfer data from SQLite 3 to MySQL";
+ homepage = "https://github.com/techouse/sqlite3-to-mysql";
+ license = licenses.mit;
+ maintainers = with maintainers; [ gador ];
+ };
+}
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index bf19e7a9ba2f..15a7625023e1 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "10.1.2";
+ version = "10.2.0";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
- sha256 = "sha256-/xabrMFcP8O2haGzqJ64u/O2snk9dJ9Sm17c3kr3nsY=";
+ sha256 = "sha256-gIRK0ZMDivyQ1nUF3QU5tQYy/2RsNKMOuKNr42tJNVM=";
};
- cargoSha256 = "sha256-mWV8h2l7kJnTfTyF74BqR/qaVpswUqI971IDiBZF3XE=";
+ cargoSha256 = "sha256-wgPafGFi5wPsFS1Ya4Dg/lq5tEtf9vfzR6EGXo3veEg=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index e15b0072be76..4bdd8d42026a 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -16,11 +16,11 @@ in
stdenv.mkDerivation rec {
pname = "dropbear";
- version = "2020.81";
+ version = "2022.82";
src = fetchurl {
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
- sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
+ sha256 = "sha256-OgONK7wCvyi73SDAEgkfdBo+xcvkYGkYEdcUh2qtddE=";
};
dontDisableStatic = enableStatic;
diff --git a/pkgs/tools/networking/dropbear/pass-path.patch b/pkgs/tools/networking/dropbear/pass-path.patch
index 2ce08b05799d..6f37d0155744 100644
--- a/pkgs/tools/networking/dropbear/pass-path.patch
+++ b/pkgs/tools/networking/dropbear/pass-path.patch
@@ -1,36 +1,39 @@
diff --git a/svr-chansession.c b/svr-chansession.c
-index e44299e..7ef750a 100644
+index 9ae2e60..2db7598 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
-@@ -893,6 +893,8 @@ static void addchildpid(struct ChanSess *chansess, pid_t pid) {
- static void execchild(void *user_data) {
- struct ChanSess *chansess = user_data;
+@@ -948,6 +948,8 @@ static void addchildpid(struct ChanSess *chansess, pid_t pid) {
+ static void execchild(const void *user_data) {
+ const struct ChanSess *chansess = user_data;
char *usershell = NULL;
-+ const char *path = DEFAULT_PATH;
++ const char *path = (getuid() == 0) ? DEFAULT_ROOT_PATH : DEFAULT_PATH;
+ const char *ldpath = NULL;
-
- /* with uClinux we'll have vfork()ed, so don't want to overwrite the
- * hostkey. can't think of a workaround to clear it */
-@@ -905,6 +907,10 @@ static void execchild(void *user_data) {
+ char *cp = NULL;
+ char *envcp = getenv("LANG");
+ if (envcp != NULL) {
+@@ -965,6 +967,11 @@ static void execchild(const void *user_data) {
seedrandom();
#endif
-+ if (getenv("PATH"))
++ if (getenv("PATH")) {
+ path = getenv("PATH");
++ }
+ ldpath = getenv("LD_LIBRARY_PATH");
+
- /* clear environment */
+ /* clear environment if -e was not set */
/* if we're debugging using valgrind etc, we need to keep the LD_PRELOAD
* etc. This is hazardous, so should only be used for debugging. */
-@@ -948,7 +954,10 @@ static void execchild(void *user_data) {
+@@ -1012,10 +1019,9 @@ static void execchild(const void *user_data) {
addnewvar("LOGNAME", ses.authstate.pw_name);
addnewvar("HOME", ses.authstate.pw_dir);
addnewvar("SHELL", get_user_shell());
-- addnewvar("PATH", DEFAULT_PATH);
+- if (getuid() == 0) {
+- addnewvar("PATH", DEFAULT_ROOT_PATH);
+- } else {
+- addnewvar("PATH", DEFAULT_PATH);
+ addnewvar("PATH", path);
+ if (ldpath != NULL) {
+ addnewvar("LD_LIBRARY_PATH", ldpath);
-+ }
- if (chansess->term != NULL) {
- addnewvar("TERM", chansess->term);
}
+ if (cp != NULL) {
+ addnewvar("LANG", cp);
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 7b04e49da702..d5af78afb66d 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
patches = [
# Fixes "Fatal: buffer too small" error
./0001-Increase-imap_vprintf-buffer-size.patch
+ # Fix #202595: SSL error "Socket error: ... unexpected eof while reading"
+ # Source: https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/
+ ./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch
];
nativeBuildInputs = [ pkg-config perl ];
diff --git a/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch b/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch
new file mode 100644
index 000000000000..9177085ecad7
--- /dev/null
+++ b/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch
@@ -0,0 +1,76 @@
+From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen
+Date: Mon, 6 Jun 2022 11:55:37 +0200
+Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL
+ connections
+
+gmail apparently doesn't send a close notification (SSL_shutdown())
+before closing the TCP socket.
+---
+ src/drv_imap.c | 7 +++++--
+ src/socket.c | 9 +++++++++
+ src/socket.h | 1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/drv_imap.c b/src/drv_imap.c
+index fb8d165..6286045 100644
+--- a/src/drv_imap.c
++++ b/src/drv_imap.c
+@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux )
+ error( "IMAP error: unexpected BYE response: %s\n", cmd );
+ /* We just wait for the server to close the connection now. */
+ ctx->expectEOF = 1;
++ socket_expect_eof( &ctx->conn );
+ } else {
+ /* We still need to wait for the LOGOUT's tagged OK. */
+ }
+@@ -1882,10 +1883,12 @@ static void
+ imap_cleanup_p2( imap_store_t *ctx,
+ imap_cmd_t *cmd ATTR_UNUSED, int response )
+ {
+- if (response == RESP_NO)
++ if (response == RESP_NO) {
+ imap_cancel_store( &ctx->gen );
+- else if (response == RESP_OK)
++ } else if (response == RESP_OK) {
+ ctx->expectEOF = 1;
++ socket_expect_eof( &ctx->conn );
++ }
+ }
+
+ /******************* imap_open_store *******************/
+diff --git a/src/socket.c b/src/socket.c
+index ac3c847..892cece 100644
+--- a/src/socket.c
++++ b/src/socket.c
+@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect )
+ conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 );
+ }
+
++void
++socket_expect_eof( conn_t *sock )
++{
++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL
++ if (sock->ssl)
++ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF );
++#endif
++}
++
+ int
+ socket_read( conn_t *conn, char *buf, uint len )
+ {
+diff --git a/src/socket.h b/src/socket.h
+index 5b1edd0..af679aa 100644
+--- a/src/socket.h
++++ b/src/socket.h
+@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) );
+ void socket_start_deflate( conn_t *conn );
+ void socket_close( conn_t *sock );
+ void socket_expect_activity( conn_t *sock, int expect );
++void socket_expect_eof( conn_t *sock );
+ int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */
+ char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */
+ typedef enum { KeepOwn = 0, GiveOwn } ownership_t;
+--
+2.38.0
+
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 7cc169173004..7997962f3b97 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -14,16 +14,16 @@ let
in
buildGoModule rec {
pname = "netbird";
- version = "0.10.9";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "netbirdio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-i9vbzb/FKaT8Aqqqb8Nlb24Mdu8epPprOiGlt1ER39I=";
+ sha256 = "sha256-9dp/OMHIA1qYM4XLWOTPmlUm6+7EOE9PFsIa8IcZ/8M=";
};
- vendorSha256 = "sha256-c4LyIEyFNseFuHIGZanzIYSBkDtV0XtEvohAkRCBDbo=";
+ vendorSha256 = "sha256-TfHBvcG3e+yjifPVo0ZgcvLvD16fni4m71nCr4cCBD4=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
diff --git a/pkgs/tools/networking/popura/default.nix b/pkgs/tools/networking/popura/default.nix
new file mode 100644
index 000000000000..e6e67cafe7a8
--- /dev/null
+++ b/pkgs/tools/networking/popura/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "popura";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "${pname}-network";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-iCu6/vD4vgn7aGdwK+OB8ib/QwUwoFuxDUs7vqbTZQc=";
+ };
+
+ vendorHash = "sha256-9lQC35yt1S2uch3qgwNfa/1FHy+Qi1D5Jo7DWNMgU9w=";
+
+ ldflags = let pkgSrc = "github.com/yggdrasil-network/yggdrasil-go/src/version"; in [
+ "-s"
+ "-w"
+ "-X=${pkgSrc}.buildName=yggdrasil"
+ "-X=${pkgSrc}.buildVersion=${version}"
+ ];
+
+ meta = with lib; {
+ description = "An alternative Yggdrasil network client";
+ homepage = "https://github.com/popura-network/popura";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ urandom ];
+ mainProgram = "yggdrasil";
+ };
+}
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
deleted file mode 100644
index 01eced9a5664..000000000000
--- a/pkgs/tools/networking/tlspool/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, cmake, pkg-config, arpa2cm
-, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh
-, softhsm
-}:
-
-let
- pname = "tlspool";
- version = "20180227";
-in
-
-stdenv.mkDerivation {
- name = "${pname}-${version}";
- src = fetchFromGitHub {
- owner = "arpa2";
- repo = "tlspool";
- rev = "b4459637d71c7602e94d455e23c74f3973b9cf30";
- sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r";
- };
-
- nativeBuildInputs = [
- cmake pkg-config arpa2cm
- ];
-
- buildInputs = [
- openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh
- ];
-
- postPatch = ''
- # CMake is probably confused because the current version isn't 1.2.6, but 1.2-6
- substituteInPlace CMakeLists.txt \
- --replace "Quick-DER 1.2.4" "Quick-DER 1.2"
- substituteInPlace etc/tlspool.conf \
- --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
- --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
- '';
-
- postInstall = ''
- mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool
- cp -R $src/etc/* $out/etc/tlspool/
- cp $src/include/tlspool/*.h $out/include/${pname}
- cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/
- cp $src/src/*.h $out/include/${pname}
- '';
-
- meta = with lib; {
- description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment";
- license = licenses.gpl3;
- homepage = "http://www.tlspool.org";
- maintainers = with maintainers; [ leenaars qknight ];
- };
-}
diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix
index ed1ebb0feda2..eba8abbf7905 100644
--- a/pkgs/tools/networking/xxh/default.nix
+++ b/pkgs/tools/networking/xxh/default.nix
@@ -1,19 +1,16 @@
{ lib
, fetchFromGitHub
-, buildPythonApplication
-, pexpect
-, pyyaml
+, python3
, openssh
, nixosTests
-, pythonOlder
}:
-buildPythonApplication rec{
+python3.pkgs.buildPythonApplication rec{
pname = "xxh";
version = "0.8.12";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
@@ -23,8 +20,8 @@ buildPythonApplication rec{
};
propagatedBuildInputs = [
- pexpect
- pyyaml
+ python3.pkgs.pexpect
+ python3.pkgs.pyyaml
openssh
];
diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
index 5f924c81a4e1..b2490a211b88 100644
--- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix
+++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
@@ -22,7 +22,6 @@
mtl,
nix-derivation,
optics,
- process,
random,
relude,
safe,
@@ -39,10 +38,10 @@
}:
mkDerivation {
pname = "nix-output-monitor";
- version = "2.0.0.4";
+ version = "2.0.0.5";
src = fetchzip {
- url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.4.tar.gz";
- sha256 = "1pgrynsjjry253fqpmm3yr4k9xcvqffnbs4p8i1nlfi9l821wj8c";
+ url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.5.tar.gz";
+ sha256 = "02xrbf2nr64yfny3idkjb1xbd97wl8m5viifrwjf4hi6ivs5bl18";
};
isLibrary = true;
isExecutable = true;
@@ -126,7 +125,6 @@ mkDerivation {
mtl
nix-derivation
optics
- process
random
relude
safe
@@ -137,6 +135,7 @@ mkDerivation {
terminal-size
text
time
+ typed-process
wcwidth
word8
];
diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix
index 71af0ab1d159..600e8027edaa 100644
--- a/pkgs/tools/package-management/nix-update/default.nix
+++ b/pkgs/tools/package-management/nix-update/default.nix
@@ -8,14 +8,14 @@
buildPythonApplication rec {
pname = "nix-update";
- version = "0.9.0";
+ version = "0.10.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
- sha256 = "sha256-wivScgtcdapf5bfXR1sjuBIPQEgi6QGH/f+Aucc3CEQ=";
+ sha256 = "sha256-BChN92gZ1Ga7hIPWmdzkrg31S0iqWwXGkWb3mmRugY8=";
};
makeWrapperArgs = [
diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/tools/package-management/wapm/cli/default.nix
index b71bb166ea8b..fcb206b1a752 100644
--- a/pkgs/tools/package-management/wapm/cli/default.nix
+++ b/pkgs/tools/package-management/wapm/cli/default.nix
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
+, perl
, libiconv
, openssl
, rustPlatform
@@ -21,6 +22,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug=";
+ nativeBuildInputs = [ perl ];
+
buildInputs = [ libiconv openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index 7fea400f008c..439fd1543cf8 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
description = "Overfeatured front-end to crypt, from the Debian whois package";
license = licenses.gpl2;
maintainers = with maintainers; [ cstrahan fpletz ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix
index 5d20b65d5914..635fccc00632 100644
--- a/pkgs/tools/security/swtpm/default.nix
+++ b/pkgs/tools/security/swtpm/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "swtpm";
- version = "0.7.3";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "swtpm";
rev = "v${version}";
- sha256 = "sha256-YaNQgxk0uT8FLUIxF80jpgO/L9ygGRHaABEcs5ukq5E=";
+ sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix
index 1cbc22b1482d..cfce48228b57 100644
--- a/pkgs/tools/security/webanalyze/default.nix
+++ b/pkgs/tools/security/webanalyze/default.nix
@@ -5,20 +5,21 @@
buildGoModule rec {
pname = "webanalyze";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchFromGitHub {
owner = "rverton";
repo = pname;
- rev = "v${version}";
- hash = "sha256-W7NgV50r/MNSF6+e0IR9C1dcg/k0w67GcTs0NTbhKBc=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-1z4hi9a/OzBXIMBk1f0JpPMV/kRgBnTQAEygIZqV+1w=";
};
- vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0=";
+ vendorHash = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0=";
meta = with lib; {
description = "Tool to uncover technologies used on websites";
homepage = "https://github.com/rverton/webanalyze";
+ changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 6af7e76dfd2a..3cb12bd64524 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "runitor";
- version = "1.0.0";
+ version = "1.1.1";
vendorSha256 = null;
src = fetchFromGitHub {
owner = "bdd";
repo = "runitor";
rev = "v${version}";
- sha256 = "sha256-6+U6Mh1XMdGaAmOrqUlVBX9d/GfOgXE22GwcLl0EfIU=";
+ sha256 = "sha256-Vm982XbbFuwCNBkGWKoPdvOFoQEq4mVCPj4nXHEFnZ8=";
};
ldflags = [
diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix
index 435ca0805ab1..c65a05c2a73c 100644
--- a/pkgs/tools/text/goawk/default.nix
+++ b/pkgs/tools/text/goawk/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "goawk";
- version = "1.20.0";
+ version = "1.21.0";
src = fetchFromGitHub {
owner = "benhoyt";
repo = "goawk";
rev = "v${version}";
- sha256 = "sha256-omUtMNB8VBTbihy+VksCduvOENhtPApPBwUIxjVL9fI=";
+ sha256 = "sha256-I6KmNPFD8kkYDyek8lR1ZS7biPA/LYGwJqMoA2fG7Wg=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 9f237066d7c1..68bc86f144ab 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -1,35 +1,38 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ lib
+, python3
+, fetchFromGitHub
+, fetchpatch
+}:
-stdenv.mkDerivation rec {
- version = "2.6";
+python3.pkgs.buildPythonApplication rec {
pname = "txt2tags";
+ version = "unstable-2022-10-17";
- dontBuild = true;
+ format = "setuptools";
- # Python script, needs the interpreter
- propagatedBuildInputs = [ python2 ];
+ src = fetchFromGitHub {
+ owner = "txt2tags";
+ repo = "txt2tags";
+ rev = "114ab24ea9111060df136bfc1c8b1a35a59fe0f2";
+ hash = "sha256-h2OtlUMzEHKyJ9AIO1Uo9Lx7jMYZNMtC6U+usBu7gNU=";
+ };
- installPhase = ''
- mkdir -p "$out/bin"
- mkdir -p "$out/share/doc"
- mkdir -p "$out/share/man/man1/"
- sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags"
- chmod +x "$out/bin/txt2tags"
- gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"
- cp doc/userguide.pdf "$out/share/doc"
- cp -r extras/ samples/ test/ "$out/share"
+ postPatch = ''
+ substituteInPlace test/lib.py \
+ --replace 'TXT2TAGS = os.path.join(TEST_DIR, "..", "txt2tags.py")' \
+ 'TXT2TAGS = "${placeholder "out"}/bin/txt2tags"' \
+ --replace "[PYTHON] + TXT2TAGS" "TXT2TAGS"
'';
- src = fetchurl {
- url = "http://txt2tags.googlecode.com/files/${pname}-${version}.tgz";
- sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530";
- };
+ checkPhase = ''
+ ${python3.interpreter} test/run.py
+ '';
meta = {
+ changelog = "https://github.com/txt2tags/txt2tags/blob/${src.rev}/CHANGELOG.md";
+ description = "Convert between markup languages";
homepage = "https://txt2tags.org/";
- description = "A KISS markup language";
- license = lib.licenses.gpl2;
- maintainers = with lib.maintainers; [ kovirobi ];
- platforms = with lib.platforms; unix;
+ license = lib.licenses.gpl2Plus;
+ maintainers = with lib.maintainers; [ dotlambda kovirobi ];
};
}
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 4670498a9da0..74875d2af3ea 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
- version = "2.21.1";
+ version = "2.21.2";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@@ -11,7 +11,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "sha256-B8g73mU8J3M2iGapAtcX2iur6qOOaoCxYYxHb/jR6wA=";
+ sha256 = "sha256-Bukk0bU2Dz1YQPwL/7WMy3LGLHgGIYqxSzEG7NcskzI=";
};
vendorSha256 = "sha256-7P77tR2wACRgF+8A/L/wPcq6etwzAX3pFO46FfGVTiE=";
diff --git a/pkgs/tools/virtualization/dockstarter/default.nix b/pkgs/tools/virtualization/dockstarter/default.nix
new file mode 100644
index 000000000000..321722d753a3
--- /dev/null
+++ b/pkgs/tools/virtualization/dockstarter/default.nix
@@ -0,0 +1,43 @@
+{ bash
+, coreutils
+, fetchFromGitHub
+, git
+, lib
+, makeWrapper
+, ncurses
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "dockstarter";
+ version = "unstable-2022-10-26";
+
+ src = fetchFromGitHub {
+ owner = "ghostwriters";
+ repo = pname;
+ rev = "a1b6b6e29aa135c2a61ea67ca05e9e034856ca08";
+ hash = "sha256-G26DFme6YaizdE5oHBo/IqV+1quu07Bp+IykXtO/GgA=";
+ };
+
+ dontBuild = false;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ install -Dm755 main.sh $out/bin/ds
+ wrapProgram $out/bin/ds --prefix PATH : ${lib.makeBinPath [
+ bash
+ coreutils
+ git
+ ncurses
+ ]}
+ '';
+
+ meta = with lib; {
+ description = "DockSTARTer helps you get started with running apps in Docker.";
+ homepage = "https://dockstarter.com";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urandom ];
+ mainProgram = "ds";
+ };
+}
diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/tools/virtualization/onmetal-image/default.nix
new file mode 100644
index 000000000000..7ae6c6f89e09
--- /dev/null
+++ b/pkgs/tools/virtualization/onmetal-image/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+ pname = "onmetal-image";
+ version = "unstable-2022-09-28";
+
+ src = fetchFromGitHub {
+ owner = "onmetal";
+ repo = "onmetal-image";
+ rev = "26f6ac2607e1cac19c35fac94aa8cd963b19628a";
+ sha256 = "sha256-ITUm7CEaz8X7LhArGJXk4YKQcX+kOvju6Go+fGfFOcw=";
+ };
+
+ vendorSha256 = "sha256-ISDNqXoJEYy6kfCZGqHoie0jMOw9bgjYGHqBGx6mymc=";
+
+ subPackages = [ "cmd" ];
+
+ nativeBuildInputs = [
+ installShellFiles
+ ];
+
+ postInstall = ''
+ mv $out/bin/cmd $out/bin/onmetal-image
+
+ installShellCompletion --cmd onmetal-image \
+ --bash <($out/bin/onmetal-image completion bash) \
+ --fish <($out/bin/onmetal-image completion fish) \
+ --zsh <($out/bin/onmetal-image completion zsh)
+ '';
+
+ meta = with lib; {
+ description = "Onmetal OCI Image Specification, Library and Tooling";
+ homepage = "https://github.com/onmetal/onmetal-image";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2367481482e4..8043bfd33cbc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -584,6 +584,7 @@ mapAliases ({
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
+ gringo = clingo; # added 2022-11-27
gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9614c18529b..4bcd60c15077 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -608,8 +608,7 @@ with pkgs;
archiver = callPackage ../applications/misc/archiver { };
- # It segfaults if it uses qt5.15
- digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox {
+ digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -686,6 +685,8 @@ with pkgs;
dispad = callPackage ../tools/X11/dispad { };
+ diswall = callPackage ../applications/networking/diswall { };
+
dupeguru = callPackage ../applications/misc/dupeguru { };
dump1090 = callPackage ../applications/radio/dump1090 { };
@@ -1618,9 +1619,7 @@ with pkgs;
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
- ludusavi = callPackage ../applications/backup/ludusavi {
- inherit (plasma5Packages) kdialog;
- };
+ ludusavi = callPackage ../applications/backup/ludusavi { };
maiko = callPackage ../applications/emulators/maiko { };
@@ -2290,7 +2289,7 @@ with pkgs;
brakeman = callPackage ../development/tools/analysis/brakeman { };
- brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;
+ brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
# Derivation's result is not used by nixpkgs. Useful for validation for
# regressions of bootstrapTools on hydra and on ofborg. Example:
@@ -3988,6 +3987,8 @@ with pkgs;
esptool = callPackage ../tools/misc/esptool { };
+ esptool_3 = callPackage ../tools/misc/esptool/3.nix { };
+
esptool-ck = callPackage ../tools/misc/esptool-ck { };
ephemeralpg = callPackage ../development/tools/database/ephemeralpg {};
@@ -4281,8 +4282,6 @@ with pkgs;
grim = callPackage ../tools/graphics/grim { };
- gringo = callPackage ../tools/misc/gringo { };
-
grit = callPackage ../tools/misc/grit { };
grobi = callPackage ../tools/X11/grobi { };
@@ -5408,7 +5407,6 @@ with pkgs;
convertlit = callPackage ../tools/text/convertlit { };
collectd = callPackage ../tools/system/collectd {
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
inherit (darwin.apple_sdk.frameworks) IOKit;
};
@@ -6851,8 +6849,6 @@ with pkgs;
fsarchiver = callPackage ../tools/archivers/fsarchiver { };
- fsfs = callPackage ../tools/filesystems/fsfs { };
-
fstl = qt5.callPackage ../applications/graphics/fstl { };
fswebcam = callPackage ../os-specific/linux/fswebcam { };
@@ -7928,10 +7924,7 @@ with pkgs;
i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
- i2p = callPackage ../tools/networking/i2p {
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ i2p = callPackage ../tools/networking/i2p { };
i2pd = callPackage ../tools/networking/i2pd { };
@@ -11089,7 +11082,7 @@ with pkgs;
rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
- rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { };
+ rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };
rowhammer-test = callPackage ../tools/system/rowhammer-test { };
@@ -11262,8 +11255,6 @@ with pkgs;
screen-message = callPackage ../tools/X11/screen-message { };
- screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
-
screenkey = callPackage ../applications/video/screenkey { };
scrub = callPackage ../tools/misc/scrub { };
@@ -11621,6 +11612,8 @@ with pkgs;
sqliteman = callPackage ../applications/misc/sqliteman { };
+ sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };
+
sqls = callPackage ../applications/misc/sqls { };
stdman = callPackage ../data/documentation/stdman { };
@@ -12090,8 +12083,6 @@ with pkgs;
tldr-hs = haskellPackages.tldr;
- tlspool = callPackage ../tools/networking/tlspool { };
-
tlsx = callPackage ../tools/security/tlsx { };
tmate = callPackage ../tools/misc/tmate { };
@@ -12985,7 +12976,7 @@ with pkgs;
wireguard-go = callPackage ../tools/networking/wireguard-go { };
- wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { };
+ wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { };
wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin {
libjpeg8 = libjpeg.override { enableJpeg8 = true; };
@@ -13276,6 +13267,8 @@ with pkgs;
zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
+ zsh-forgit = callPackage ../shells/zsh/zsh-forgit { };
+
zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { };
@@ -13418,10 +13411,7 @@ with pkgs;
_4th = callPackage ../development/compilers/4th { };
- abcl = callPackage ../development/compilers/abcl {
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ abcl = callPackage ../development/compilers/abcl { };
temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17;
temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17;
@@ -13509,7 +13499,9 @@ with pkgs;
avra = callPackage ../development/compilers/avra { };
- ballerina = callPackage ../development/compilers/ballerina { openjdk = openjdk11; };
+ ballerina = callPackage ../development/compilers/ballerina {
+ openjdk = openjdk11_headless;
+ };
beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { };
@@ -14725,8 +14717,6 @@ with pkgs;
buildLlvmTools = buildPackages.llvmPackages_11.tools;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;
targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm;
- } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
- stdenv = gcc7Stdenv;
}));
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
@@ -14734,8 +14724,6 @@ with pkgs;
buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;
- } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
- stdenv = gcc7Stdenv;
}));
llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({
@@ -14743,8 +14731,6 @@ with pkgs;
buildLlvmTools = buildPackages.llvmPackages_13.tools;
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;
targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm;
- } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
- stdenv = gcc7Stdenv;
}));
llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({
@@ -14752,8 +14738,6 @@ with pkgs;
buildLlvmTools = buildPackages.llvmPackages_14.tools;
targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries;
targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm;
- } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
- stdenv = gcc7Stdenv;
}));
llvmPackages_latest = llvmPackages_14;
@@ -14768,9 +14752,7 @@ with pkgs;
marst = callPackage ../development/compilers/marst { };
- mercury = callPackage ../development/compilers/mercury {
- jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ mercury = callPackage ../development/compilers/mercury { };
microscheme = callPackage ../development/compilers/microscheme { };
@@ -14988,8 +14970,14 @@ with pkgs;
rocfft = callPackage ../development/libraries/rocfft { };
+ rocrand = callPackage ../development/libraries/rocrand { };
+
tensile = python3Packages.callPackage ../development/libraries/tensile { };
+ rocwmma = callPackage ../development/libraries/rocwmma {
+ inherit (llvmPackages) openmp;
+ };
+
rocblas = callPackage ../development/libraries/rocblas {
inherit (llvmPackages_rocm) llvm;
};
@@ -15000,6 +14988,19 @@ with pkgs;
rocthrust = callPackage ../development/libraries/rocthrust { };
+ miopen = callPackage ../development/libraries/miopen {
+ inherit (llvmPackages_rocm) clang llvm;
+ boost = boost.override { enableStatic = true; };
+ };
+
+ miopen-hip = miopen.override {
+ useOpenCL = false;
+ };
+
+ miopen-opencl = miopen.override {
+ useOpenCL = true;
+ };
+
rtags = callPackage ../development/tools/rtags {
inherit (darwin) apple_sdk;
};
@@ -16304,23 +16305,13 @@ with pkgs;
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
- antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
- jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731
- };
-
- antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix {
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
- antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix {
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
+ antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
+ antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
antlr3 = antlr3_5;
- inherit (callPackages ../development/tools/parsing/antlr/4.nix {
- jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- }) antlr4_8;
-
inherit (callPackages ../development/tools/parsing/antlr/4.nix { })
+ antlr4_8
antlr4_9
antlr4_10
antlr4_11;
@@ -17544,11 +17535,11 @@ with pkgs;
patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then
patchelf_0_13
else
- patchelf_0_14;
+ patchelfStable;
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
- patchelf = patchelf_0_14;
+ patchelf = patchelfStable;
};
- patchelf_0_14 = callPackage ../development/tools/misc/patchelf { };
+ patchelfStable = callPackage ../development/tools/misc/patchelf { };
patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });
@@ -17885,6 +17876,8 @@ with pkgs;
strace = callPackage ../development/tools/misc/strace { };
+ strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };
+
stylua = callPackage ../development/tools/stylua { };
summon = callPackage ../development/tools/summon { };
@@ -18852,7 +18845,7 @@ with pkgs;
samba = if stdenv.isDarwin then null else samba;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
- VideoDecodeAcceleration;
+ VideoDecodeAcceleration VideoToolbox;
};
ffmpeg_5-full = ffmpeg-full.override {
@@ -19076,11 +19069,7 @@ with pkgs;
ghcid = haskellPackages.ghcid.bin;
- graphia = libsForQt514.callPackage ../applications/science/misc/graphia {
- # Using gcc 10 because this fails to build with gcc 11
- # Error similar to this https://github.com/RPCS3/rpcs3/issues/10291
- stdenv = gcc10Stdenv;
- };
+ graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
graphinder = callPackage ../tools/security/graphinder { };
@@ -22561,6 +22550,8 @@ with pkgs;
speech-tools = callPackage ../development/libraries/speech-tools {};
+ speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {};
+
speex = callPackage ../development/libraries/speex {
fftw = fftwFloat;
};
@@ -26708,9 +26699,7 @@ with pkgs;
national-park-typeface = callPackage ../data/fonts/national-park { };
- netease-music-tui = callPackage ../applications/audio/netease-music-tui {
- openssl = openssl_1_1;
- };
+ netease-music-tui = callPackage ../applications/audio/netease-music-tui { };
netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk {
inherit (darwin.apple_sdk.frameworks) Foundation SystemConfiguration;
@@ -27052,7 +27041,6 @@ with pkgs;
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
inherit (gnome) adwaita-icon-theme;
- inherit (plasma5Packages) breeze-icons;
};
tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };
@@ -27251,6 +27239,8 @@ with pkgs;
aacgain = callPackage ../applications/audio/aacgain { };
+ aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {};
+
abcde = callPackage ../applications/audio/abcde {
inherit (python3Packages) eyeD3;
};
@@ -27727,7 +27717,7 @@ with pkgs;
cava = callPackage ../applications/audio/cava { };
- cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { };
+ cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
cbatticon = callPackage ../applications/misc/cbatticon { };
@@ -28054,6 +28044,8 @@ with pkgs;
docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { };
+ dockstarter = callPackage ../tools/virtualization/dockstarter {};
+
doodle = callPackage ../applications/search/doodle { };
dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
@@ -28368,8 +28360,6 @@ with pkgs;
kvmtool = callPackage ../applications/virtualization/kvmtool { };
- exrdisplay = callPackage ../applications/graphics/exrdisplay { };
-
exrtools = callPackage ../applications/graphics/exrtools { };
f1viewer = callPackage ../applications/video/f1viewer {};
@@ -28854,9 +28844,7 @@ with pkgs;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- freenet = callPackage ../applications/networking/p2p/freenet {
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ freenet = callPackage ../applications/networking/p2p/freenet { };
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
@@ -29393,6 +29381,8 @@ with pkgs;
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
+ popura = callPackage ../tools/networking/popura {};
+
shepherd = nodePackages."@nerdwallet/shepherd";
skate = callPackage ../applications/misc/skate { };
@@ -29698,7 +29688,7 @@ with pkgs;
lua = lua5_1;
};
- ipe = libsForQt514.callPackage ../applications/graphics/ipe {
+ ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;
@@ -30765,6 +30755,8 @@ with pkgs;
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
+ onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
+
opcr-policy = callPackage ../development/tools/opcr-policy { };
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
@@ -30971,7 +30963,7 @@ with pkgs;
mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
- mythtv = libsForQt514.callPackage ../applications/video/mythtv { };
+ mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
micro = callPackage ../applications/editors/micro { };
@@ -32793,7 +32785,6 @@ with pkgs;
virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit;
inherit (gnome2) libIDL;
- jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
virtualboxHardened = lowPrio (virtualbox.override {
@@ -33152,7 +33143,7 @@ with pkgs;
gtk = gtk2;
};
- xxh = with python3Packages; toPythonApplication xxh;
+ xxh = callPackage ../tools/networking/xxh { };
kodiPackages = recurseIntoAttrs (kodi.packages);
@@ -33377,7 +33368,7 @@ with pkgs;
xnotify = callPackage ../tools/X11/xnotify { };
- xygrib = libsForQt514.callPackage ../applications/misc/xygrib {};
+ xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
xzgv = callPackage ../applications/graphics/xzgv { };
@@ -34730,7 +34721,7 @@ with pkgs;
openssl = openssl_1_1;
};
- sienna = callPackage ../games/sienna { love = love_0_10; };
+ sienna = callPackage ../games/sienna { };
sil = callPackage ../games/sil { };
@@ -35827,9 +35818,7 @@ with pkgs;
gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; });
stdenv = gccStdenv;
};
- cvc4 = callPackage ../applications/science/logic/cvc4 {
- jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
- };
+ cvc4 = callPackage ../applications/science/logic/cvc4 { };
cvc5 = callPackage ../applications/science/logic/cvc5 { };
@@ -36377,7 +36366,7 @@ with pkgs;
### SCIENCE/ROBOTICS
- apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { };
+ apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
@@ -36986,6 +36975,8 @@ with pkgs;
nix-serve = callPackage ../tools/package-management/nix-serve { };
+ nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
+
nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { };
alejandra = callPackage ../tools/nix/alejandra { };
@@ -37871,7 +37862,6 @@ with pkgs;
simplehttp2server = callPackage ../servers/simplehttp2server { };
simple-http-server = callPackage ../servers/simple-http-server {
- openssl = openssl_1_1;
inherit (darwin.apple_sdk.frameworks) Security;
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e25b0335c61..c3f2c9f7cf45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7354,11 +7354,17 @@ self: super: with self; {
proto-plus = callPackage ../development/python-modules/proto-plus { };
+ # Protobuf 4.x
protobuf = callPackage ../development/python-modules/protobuf {
# If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
inherit (pkgs) protobuf;
};
+ # Protobuf 3.x
+ protobuf3 = callPackage ../development/python-modules/protobuf {
+ protobuf = pkgs.protobuf3_20;
+ };
+
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
proton-client = callPackage ../development/python-modules/proton-client { };
@@ -11653,6 +11659,8 @@ self: super: with self; {
urwid-readline = callPackage ../development/python-modules/urwid-readline { };
+ usb-devices = callPackage ../development/python-modules/usb-devices { };
+
usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { };
usbtmc = callPackage ../development/python-modules/usbtmc { };
@@ -12149,8 +12157,6 @@ self: super: with self; {
inherit (pkgs.xorg) xorgserver;
};
- xxh = callPackage ../tools/networking/xxh { };
-
xxhash = callPackage ../development/python-modules/xxhash { };
yabadaba = callPackage ../development/python-modules/yabadaba { };