diff --git a/.github/workflows/ofborg-pending.yml b/.github/workflows/ofborg-pending.yml
new file mode 100644
index 00000000000..b5e0a7c46c8
--- /dev/null
+++ b/.github/workflows/ofborg-pending.yml
@@ -0,0 +1,33 @@
+name: "Set pending OfBorg status"
+on:
+ pull_request_target:
+
+# Sets the ofborg-eval status to "pending" to signal that we are waiting for
+# OfBorg even if it is running late. The status will be overwritten by OfBorg
+# once it starts evaluation.
+
+# WARNING:
+# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to
+# the GitHub repository. This means that it should not evaluate user input in a
+# way that allows code injection.
+
+permissions:
+ contents: read
+
+jobs:
+ action:
+ if: github.repository_owner == 'NixOS'
+ permissions:
+ statuses: write
+ runs-on: ubuntu-latest
+ steps:
+ - name: "Set pending OfBorg status"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ curl \
+ -X POST \
+ -H "Accept: application/vnd.github.v3+json" \
+ -H "Authorization: Bearer $GITHUB_TOKEN" \
+ -d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \
+ "https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses"
diff --git a/.github/workflows/pending-clear.yml b/.github/workflows/pending-clear.yml
deleted file mode 100644
index 7e8960597e5..00000000000
--- a/.github/workflows/pending-clear.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: "clear pending status"
-
-on:
- check_suite:
- types: [ completed ]
-
-permissions:
- contents: read
-
-jobs:
- action:
- permissions:
- statuses: write
- runs-on: ubuntu-latest
- steps:
- - name: clear pending status
- if: github.repository_owner == 'NixOS' && github.event.check_suite.app.name == 'OfBorg'
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- curl \
- -X POST \
- -H "Accept: application/vnd.github.v3+json" \
- -H "Authorization: token $GITHUB_TOKEN" \
- -d '{"state": "success", "target_url": " ", "description": " ", "context": "Wait for ofborg"}' \
- "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.check_suite.head_sha }}"
diff --git a/.github/workflows/pending-set.yml b/.github/workflows/pending-set.yml
deleted file mode 100644
index 0dc3031d87c..00000000000
--- a/.github/workflows/pending-set.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "set pending status"
-
-on:
- pull_request_target:
-
-# WARNING:
-# When extending this action, be aware that $GITHUB_TOKEN allows write access to
-# the GitHub repository. This means that it should not evaluate user input in a
-# way that allows code injection.
-
-permissions:
- contents: read
-
-jobs:
- action:
- permissions:
- statuses: write
- runs-on: ubuntu-latest
- steps:
- - name: set pending status
- if: github.repository_owner == 'NixOS'
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- curl \
- -X POST \
- -H "Accept: application/vnd.github.v3+json" \
- -H "Authorization: token $GITHUB_TOKEN" \
- -d '{"state": "pending", "target_url": " ", "description": "This pending status will be cleared when ofborg starts eval.", "context": "Wait for ofborg"}' \
- "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}"
diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
index 8580368c3e3..3d00ed1b677 100644
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@@ -34,6 +34,8 @@ jobs:
--argstr keep-going true \
--argstr max-workers 2 \
--argstr path terraform-providers
+ - name: clean repo
+ run: |
git clean -f
- name: create PR
uses: peter-evans/create-pull-request@v4
@@ -41,6 +43,8 @@ jobs:
body: |
Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
+ https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}
+
Check that all providers build with:
```
@ofborg build terraform.full
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3e5cefc356c..122dbc34c62 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4404,6 +4404,12 @@
name = "Fedx sudo";
matrix = "fedx:matrix.org";
};
+ fee1-dead = {
+ email = "ent3rm4n@gmail.com";
+ github = "fee1-dead";
+ githubId = 43851243;
+ name = "Deadbeef";
+ };
fehnomenal = {
email = "fehnomenal@fehn.systems";
github = "fehnomenal";
@@ -12169,6 +12175,15 @@
githubId = 1940568;
name = "Sebastian Ball";
};
+ seberm = {
+ email = "seberm@seberm.com";
+ github = "seberm";
+ githubId = 212597;
+ name = "Otto Sabart";
+ keys = [{
+ fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3";
+ }];
+ };
sebtm = {
email = "mail@sebastian-sellmeier.de";
github = "SebTM";
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index a0e9405343b..5c32817979a 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -200,6 +200,10 @@ with lib;
type = lines;
description = lib.mdDoc ''
Extra configuration. Contents will be added verbatim to the configuration file.
+
+ ::: {.note}
+ `daemon` should not be added here because it does not work great with the systemd-timer approach the service uses.
+ :::
'';
};
};
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 7f42df0b08f..0242a3780ff 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -16,7 +16,7 @@
certain packets anyway, you can insert rules at the start of
this chain.
- - ‘nixos-fw-rpfilter’ is used as the main chain in the raw table,
+ - ‘nixos-fw-rpfilter’ is used as the main chain in the mangle table,
called from the built-in ‘PREROUTING’ chain. If the kernel
supports it and `cfg.checkReversePath` is set this chain will
perform a reverse path filter test.
@@ -109,28 +109,28 @@ let
ip46tables -N nixos-fw
# Clean up rpfilter rules
- ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
- ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true
- ip46tables -t raw -X nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t mangle -F nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t mangle -X nixos-fw-rpfilter 2> /dev/null || true
${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) ''
# Perform a reverse-path test to refuse spoofers
- # For now, we just drop, as the raw table doesn't have a log-refuse yet
- ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true
- ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN
+ # For now, we just drop, as the mangle table doesn't have a log-refuse yet
+ ip46tables -t mangle -N nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t mangle -A nixos-fw-rpfilter -m rpfilter --validmark ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN
# Allows this host to act as a DHCP4 client without first having to use APIPA
- iptables -t raw -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN
+ iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN
# Allows this host to act as a DHCPv4 server
- iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN
+ iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN
${optionalString cfg.logReversePathDrops ''
- ip46tables -t raw -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: "
+ ip46tables -t mangle -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: "
''}
- ip46tables -t raw -A nixos-fw-rpfilter -j DROP
+ ip46tables -t mangle -A nixos-fw-rpfilter -j DROP
- ip46tables -t raw -A PREROUTING -j nixos-fw-rpfilter
+ ip46tables -t mangle -A PREROUTING -j nixos-fw-rpfilter
''}
# Accept all traffic on the trusted interfaces.
@@ -218,7 +218,7 @@ let
ip46tables -D INPUT -j nixos-fw 2>/dev/null || true
${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) ''
- ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true
+ ip46tables -t mangle -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true
''}
${cfg.extraStopCommands}
diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix
index b43c3e85132..a678d743bb7 100644
--- a/nixos/modules/services/networking/wg-quick.nix
+++ b/nixos/modules/services/networking/wg-quick.nix
@@ -328,9 +328,6 @@ in {
config = mkIf (cfg.interfaces != {}) {
boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
environment.systemPackages = [ pkgs.wireguard-tools ];
- # This is forced to false for now because the default "--validmark" rpfilter we apply on reverse path filtering
- # breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard.
- networking.firewall.checkReversePath = false;
systemd.services = mapAttrs' generateUnit cfg.interfaces;
# Prevent networkd from clearing the rules set by wg-quick when restarted (e.g. when waking up from suspend).
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 47a433c0322..bc1037427a0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -441,6 +441,7 @@ in {
non-default-filesystems = handleTest ./non-default-filesystems.nix {};
noto-fonts = handleTest ./noto-fonts.nix {};
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
+ nscd = handleTest ./nscd.nix {};
nsd = handleTest ./nsd.nix {};
nzbget = handleTest ./nzbget.nix {};
nzbhydra2 = handleTest ./nzbhydra2.nix {};
@@ -531,7 +532,6 @@ in {
rasdaemon = handleTest ./rasdaemon.nix {};
redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
- resolv = handleTest ./resolv.nix {};
restartByActivationScript = handleTest ./restart-by-activation-script.nix {};
restic = handleTest ./restic.nix {};
retroarch = handleTest ./retroarch.nix {};
diff --git a/nixos/tests/nscd.nix b/nixos/tests/nscd.nix
new file mode 100644
index 00000000000..7bb6d90c3d4
--- /dev/null
+++ b/nixos/tests/nscd.nix
@@ -0,0 +1,107 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+let
+ # build a getent that itself doesn't see anything in /etc/hosts and
+ # /etc/nsswitch.conf, by using libredirect to steer its own requests to
+ # /dev/null.
+ # This means is /has/ to go via nscd to actuallly resolve any of the
+ # additionally configured hosts.
+ getent' = pkgs.writeScript "getent-without-etc-hosts" ''
+ export NIX_REDIRECTS=/etc/hosts=/dev/null:/etc/nsswitch.conf=/dev/null
+ export LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
+ exec getent $@
+ '';
+in
+{
+ name = "nscd";
+
+ nodes.machine = { pkgs, ... }: {
+ imports = [ common/user-account.nix ];
+ networking.extraHosts = ''
+ 2001:db8::1 somehost.test
+ 192.0.2.1 somehost.test
+ '';
+
+ specialisation = {
+ withUnscd.configuration = { ... }: {
+ services.nscd.package = pkgs.unscd;
+ };
+ };
+ };
+
+ testScript = { nodes, ... }:
+ let
+ specialisations = "${nodes.machine.system.build.toplevel}/specialisation";
+ in
+ ''
+ # Regression test for https://github.com/NixOS/nixpkgs/issues/50273
+ def test_dynamic_user():
+ with subtest("DynamicUser actually allocates a user"):
+ assert "iamatest" in machine.succeed(
+ "systemd-run --pty --property=Type=oneshot --property=DynamicUser=yes --property=User=iamatest whoami"
+ )
+
+ # Test resolution of somehost.test with getent', to make sure we go via nscd
+ def test_host_lookups():
+ with subtest("host lookups via nscd"):
+ # ahosts
+ output = machine.succeed("${getent'} ahosts somehost.test")
+ assert "192.0.2.1" in output
+ assert "2001:db8::1" in output
+
+ # ahostsv4
+ output = machine.succeed("${getent'} ahostsv4 somehost.test")
+ assert "192.0.2.1" in output
+ assert "2001:db8::1" not in output
+
+ # ahostsv6
+ output = machine.succeed("${getent'} ahostsv6 somehost.test")
+ assert "192.0.2.1" not in output
+ assert "2001:db8::1" in output
+
+ # reverse lookups (hosts)
+ assert "somehost.test" in machine.succeed("${getent'} hosts 2001:db8::1")
+ assert "somehost.test" in machine.succeed("${getent'} hosts 192.0.2.1")
+
+ # Test host resolution via nss modules works
+ # We rely on nss-myhostname in this case, which resolves *.localhost and
+ # _gateway.
+ # We don't need to use getent' here, as non-glibc nss modules can only be
+ # discovered via nscd.
+ def test_nss_myhostname():
+ with subtest("nss-myhostname provides hostnames (ahosts)"):
+ # ahosts
+ output = machine.succeed("getent ahosts foobar.localhost")
+ assert "::1" in output
+ assert "127.0.0.1" in output
+
+ # ahostsv4
+ output = machine.succeed("getent ahostsv4 foobar.localhost")
+ assert "::1" not in output
+ assert "127.0.0.1" in output
+
+ # ahostsv6
+ output = machine.succeed("getent ahostsv6 foobar.localhost")
+ assert "::1" in output
+ assert "127.0.0.1" not in output
+
+ start_all()
+ machine.wait_for_unit("default.target")
+
+ # Test all tests with glibc-nscd.
+ test_dynamic_user()
+ test_host_lookups()
+ test_nss_myhostname()
+
+ with subtest("unscd"):
+ machine.succeed('${specialisations}/withUnscd/bin/switch-to-configuration test')
+ machine.wait_for_unit("default.target")
+
+ # known to fail, unscd doesn't load external NSS modules
+ # test_dynamic_user()
+
+ test_host_lookups()
+
+ # known to fail, unscd doesn't load external NSS modules
+ # test_nss_myhostname()
+ '';
+})
diff --git a/nixos/tests/resolv.nix b/nixos/tests/resolv.nix
deleted file mode 100644
index f0aa7e42aaf..00000000000
--- a/nixos/tests/resolv.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Test whether DNS resolving returns multiple records and all address families.
-import ./make-test-python.nix ({ pkgs, ... } : {
- name = "resolv";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ ckauhaus ];
- };
-
- nodes.resolv = { ... }: {
- networking.extraHosts = ''
- # IPv4 only
- 192.0.2.1 host-ipv4.example.net
- 192.0.2.2 host-ipv4.example.net
- # IP6 only
- 2001:db8::2:1 host-ipv6.example.net
- 2001:db8::2:2 host-ipv6.example.net
- # dual stack
- 192.0.2.1 host-dual.example.net
- 192.0.2.2 host-dual.example.net
- 2001:db8::2:1 host-dual.example.net
- 2001:db8::2:2 host-dual.example.net
- '';
- };
-
- testScript = ''
- def addrs_in(hostname, addrs):
- res = resolv.succeed("getent ahosts {}".format(hostname))
- for addr in addrs:
- assert addr in res, "Expected output '{}' not found in\n{}".format(addr, res)
-
-
- start_all()
- resolv.wait_for_unit("nscd")
-
- ipv4 = ["192.0.2.1", "192.0.2.2"]
- ipv6 = ["2001:db8::2:1", "2001:db8::2:2"]
-
- with subtest("IPv4 resolves"):
- addrs_in("host-ipv4.example.net", ipv4)
-
- with subtest("IPv6 resolves"):
- addrs_in("host-ipv6.example.net", ipv6)
-
- with subtest("Dual stack resolves"):
- addrs_in("host-dual.example.net", ipv4 + ipv6)
- '';
-})
diff --git a/nixos/tests/stratis/default.nix b/nixos/tests/stratis/default.nix
index 6964852e30a..42daadd5fca 100644
--- a/nixos/tests/stratis/default.nix
+++ b/nixos/tests/stratis/default.nix
@@ -4,4 +4,5 @@
{
simple = import ./simple.nix { inherit system pkgs; };
+ encryption = import ./encryption.nix { inherit system pkgs; };
}
diff --git a/nixos/tests/stratis/encryption.nix b/nixos/tests/stratis/encryption.nix
new file mode 100644
index 00000000000..3faa3171843
--- /dev/null
+++ b/nixos/tests/stratis/encryption.nix
@@ -0,0 +1,33 @@
+import ../make-test-python.nix ({ pkgs, ... }:
+ {
+ name = "stratis";
+
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ nickcao ];
+ };
+
+ nodes.machine = { pkgs, ... }: {
+ services.stratis.enable = true;
+ virtualisation.emptyDiskImages = [ 2048 ];
+ };
+
+ testScript =
+ let
+ testkey1 = pkgs.writeText "testkey1" "supersecret1";
+ testkey2 = pkgs.writeText "testkey2" "supersecret2";
+ in
+ ''
+ machine.wait_for_unit("stratisd")
+ # test creation of encrypted pool and filesystem
+ machine.succeed("stratis key set testkey1 --keyfile-path ${testkey1}")
+ machine.succeed("stratis key set testkey2 --keyfile-path ${testkey2}")
+ machine.succeed("stratis pool create testpool /dev/vdb --key-desc testkey1")
+ machine.succeed("stratis fs create testpool testfs")
+ # 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")
+ '';
+ })
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 3317823e03f..3c36291b733 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -87,12 +87,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.succeed("test -e /home/alice/user_conf_read")
machine.succeed("test -z $(ls -1 /var/log/journal)")
- # Regression test for https://github.com/NixOS/nixpkgs/issues/50273
- with subtest("DynamicUser actually allocates a user"):
- assert "iamatest" in machine.succeed(
- "systemd-run --pty --property=Type=oneshot --property=DynamicUser=yes --property=User=iamatest whoami"
- )
-
with subtest("regression test for https://bugs.freedesktop.org/show_bug.cgi?id=77507"):
retcode, output = machine.execute("systemctl status testservice1.service")
assert retcode in [0, 3] # https://bugs.freedesktop.org/show_bug.cgi?id=77507
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index eafbfec9664..08ef2d08308 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2
+{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2
, python3Packages , meson, ninja }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix
index 7b209994103..acd8bf1f74f 100644
--- a/pkgs/applications/audio/ams/default.nix
+++ b/pkgs/applications/audio/ams/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchgit
-, automake
, alsa-lib
, ladspaH
, libjack2
diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix
index 3b12aeb8868..4662002c95e 100644
--- a/pkgs/applications/audio/blanket/default.nix
+++ b/pkgs/applications/audio/blanket/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, fetchFromGitHub
, meson
, ninja
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 72f13bdb09b..ebf72588df0 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -1,6 +1,4 @@
{ lib
-, a2jmidid
-, coreutils
, libjack2
, fetchpatch
, fetchFromGitHub
@@ -8,7 +6,6 @@
, pkg-config
, pulseaudioFull
, qtbase
-, makeWrapper
, mkDerivation
, python3
}:
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 4ee5ab82e6e..87f2920c200 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
pname = "faustlive";
- version = "2.5.11";
+ version = "2.5.12";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faustlive";
rev = version;
- sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk=";
+ sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix
index 5fd4eb2fb7d..720bc1613b1 100644
--- a/pkgs/applications/audio/faustPhysicalModeling/default.nix
+++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
pname = "faustPhysicalModeling";
- version = "2.41.1";
+ version = "2.50.6";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
- sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc=";
+ sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8=";
};
buildInputs = [ faust2jaqt faust2lv2 ];
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 954a2265312..d0cff6c44fb 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib
+{ lib, stdenv, fetchsvn, cmake, pkg-config, fftwFloat, alsa-lib
, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2
, includeDemo ? true }:
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index a0defad0da0..81a97d5a054 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
-, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom
+, lv2, pkg-config, python3, raul, serd, sord, sratom
, wafHook
, suil
}:
diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
index 655fc6a9608..935e3a95038 100644
--- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
+++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config
-, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm
+, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm
, zita-convolver, zita-resampler
}:
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index ce12b239e5a..76c5de75ef5 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, mkDerivation
-, fetchurl
, fetchFromGitHub
, chromaprint
, cmake
diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix
index 287b593d3eb..5f23b9be651 100644
--- a/pkgs/applications/audio/new-session-manager/default.nix
+++ b/pkgs/applications/audio/new-session-manager/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "new-session-manager";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "linuxaudio";
repo = "new-session-manager";
rev = "v${version}";
- sha256 = "sha256-QVykRYXToeVXr7pYQy2afgEAlXrQnm68+xEUZhd+FkY=";
+ sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix
index 0e3e801d18c..59ed1ce21f5 100644
--- a/pkgs/applications/audio/oxefmsynth/default.nix
+++ b/pkgs/applications/audio/oxefmsynth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }:
+{ stdenv, lib, fetchFromGitHub, fetchzip, libX11 }:
let
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index f9e54bbbd56..d57c56a2adb 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,5 +1,4 @@
{ fetchurl
-, fetchpatch
, lib
, stdenv
, pkg-config
diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix
index aeb58911623..fc4c08a63aa 100644
--- a/pkgs/applications/audio/pd-plugins/gem/default.nix
+++ b/pkgs/applications/audio/pd-plugins/gem/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, autoreconfHook
, pkg-config
, puredata
diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix
index 26c62f3e30b..308d5b65f3e 100644
--- a/pkgs/applications/audio/pianoteq/default.nix
+++ b/pkgs/applications/audio/pianoteq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
+{ lib, stdenv, curl, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
let
versionForFile = v: builtins.replaceStrings ["."] [""] v;
diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix
index 487f86cf660..cb190cabf54 100644
--- a/pkgs/applications/audio/qmidiarp/default.nix
+++ b/pkgs/applications/audio/qmidiarp/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchgit
-, automake
, autoreconfHook
, lv2
, pkg-config
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 41e71cec2ff..1f5bb36a514 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -39,13 +39,13 @@
stdenv.mkDerivation rec {
pname = "sonic-pi";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchFromGitHub {
owner = "sonic-pi-net";
repo = pname;
rev = "v${version}";
- hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM=";
+ hash = "sha256-R+nmjIIDLoGOoCkDvJqejE1DaweHSAV8M2RvdwN5qAQ=";
};
mixFodDeps = beamPackages.fetchMixDeps {
diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix
index c0b2c64822f..56ff4c0e191 100644
--- a/pkgs/applications/audio/tap-plugins/default.nix
+++ b/pkgs/applications/audio/tap-plugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }:
+{ lib, stdenv, ladspa-sdk, pkgs, ... }:
stdenv.mkDerivation rec {
pname = "tap-plugins";
diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix
index 46957000507..bb402f425da 100644
--- a/pkgs/applications/audio/vocproc/default.nix
+++ b/pkgs/applications/audio/vocproc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
+{ lib, stdenv, fetchzip, pkg-config, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
stdenv.mkDerivation rec {
pname = "vocproc";
diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix
index 0609438b053..9500c63a7af 100644
--- a/pkgs/applications/audio/zrythm/default.nix
+++ b/pkgs/applications/audio/zrythm/default.nix
@@ -4,7 +4,6 @@
, SDL2
, alsa-lib
, libaudec
-, bash
, bash-completion
, breeze-icons
, carla
diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix
index b8b10185e0c..caac322020e 100644
--- a/pkgs/applications/blockchains/monero-cli/default.nix
+++ b/pkgs/applications/blockchains/monero-cli/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
-, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix
index a1b9f8348b6..7aeb483b5cb 100644
--- a/pkgs/applications/blockchains/openethereum/default.nix
+++ b/pkgs/applications/blockchains/openethereum/default.nix
@@ -2,7 +2,6 @@
, fetchFromGitHub
, rustPlatform
, cmake
-, llvmPackages
, openssl
, pkg-config
, stdenv
diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix
index 773071c0499..53c3a156d5e 100644
--- a/pkgs/applications/blockchains/oxen/default.nix
+++ b/pkgs/applications/blockchains/oxen/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch
-, cmake, pkg-config
+{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config
, boost, openssl, unbound
, pcsclite, readline, libsodium, hidapi
, rapidjson
diff --git a/pkgs/applications/blockchains/teos/add-cargo-lock.patch b/pkgs/applications/blockchains/teos/add-cargo-lock.patch
new file mode 100644
index 00000000000..04a49ab1214
--- /dev/null
+++ b/pkgs/applications/blockchains/teos/add-cargo-lock.patch
@@ -0,0 +1,3905 @@
+--- a/Cargo.lock 2022-09-26 16:57:09.795022563 +0200
++++ b/Cargo.lock 2022-09-29 10:21:19.312000000 +0200
+@@ -0,0 +1,3902 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++version = 3
++
++[[package]]
++name = "aead"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "ahash"
++version = "0.7.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
++dependencies = [
++ "getrandom 0.2.7",
++ "once_cell",
++ "version_check",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "anyhow"
++version = "1.0.65"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
++
++[[package]]
++name = "ascii-canvas"
++version = "3.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
++dependencies = [
++ "term",
++]
++
++[[package]]
++name = "assert-json-diff"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
++dependencies = [
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "async-channel"
++version = "1.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
++dependencies = [
++ "concurrent-queue",
++ "event-listener",
++ "futures-core",
++]
++
++[[package]]
++name = "async-executor"
++version = "1.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
++dependencies = [
++ "async-task",
++ "concurrent-queue",
++ "fastrand",
++ "futures-lite",
++ "once_cell",
++ "slab",
++]
++
++[[package]]
++name = "async-global-executor"
++version = "2.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
++dependencies = [
++ "async-channel",
++ "async-executor",
++ "async-io",
++ "async-lock",
++ "blocking",
++ "futures-lite",
++ "once_cell",
++]
++
++[[package]]
++name = "async-io"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
++dependencies = [
++ "autocfg",
++ "concurrent-queue",
++ "futures-lite",
++ "libc",
++ "log",
++ "once_cell",
++ "parking",
++ "polling",
++ "slab",
++ "socket2 0.4.7",
++ "waker-fn",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "async-lock"
++version = "2.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
++dependencies = [
++ "event-listener",
++]
++
++[[package]]
++name = "async-object-pool"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc"
++dependencies = [
++ "async-std",
++]
++
++[[package]]
++name = "async-process"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
++dependencies = [
++ "async-io",
++ "autocfg",
++ "blocking",
++ "cfg-if 1.0.0",
++ "event-listener",
++ "futures-lite",
++ "libc",
++ "once_cell",
++ "signal-hook",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "async-std"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
++dependencies = [
++ "async-channel",
++ "async-global-executor",
++ "async-io",
++ "async-lock",
++ "async-process",
++ "crossbeam-utils",
++ "futures-channel",
++ "futures-core",
++ "futures-io",
++ "futures-lite",
++ "gloo-timers",
++ "kv-log-macro",
++ "log",
++ "memchr",
++ "once_cell",
++ "pin-project-lite 0.2.9",
++ "pin-utils",
++ "slab",
++ "wasm-bindgen-futures",
++]
++
++[[package]]
++name = "async-stream"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
++dependencies = [
++ "async-stream-impl",
++ "futures-core",
++]
++
++[[package]]
++name = "async-stream-impl"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "async-task"
++version = "4.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
++
++[[package]]
++name = "async-trait"
++version = "0.1.57"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "atomic-waker"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
++
++[[package]]
++name = "backoff"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
++dependencies = [
++ "futures-core",
++ "getrandom 0.2.7",
++ "instant",
++ "pin-project-lite 0.2.9",
++ "rand 0.8.5",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "base32"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
++
++[[package]]
++name = "base64"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++
++[[package]]
++name = "base64-compat"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7"
++dependencies = [
++ "byteorder",
++]
++
++[[package]]
++name = "basic-cookies"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
++dependencies = [
++ "lalrpop",
++ "lalrpop-util",
++ "regex",
++]
++
++[[package]]
++name = "bech32"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
++
++[[package]]
++name = "bit-set"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
++dependencies = [
++ "bit-vec",
++]
++
++[[package]]
++name = "bit-vec"
++version = "0.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
++
++[[package]]
++name = "bitcoin"
++version = "0.28.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a"
++dependencies = [
++ "base64-compat",
++ "bech32",
++ "bitcoin_hashes",
++ "secp256k1",
++ "serde",
++]
++
++[[package]]
++name = "bitcoin_hashes"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "bitcoincore-rpc"
++version = "0.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd0e67dbf7a9971e7f4276f6089e9e814ce0f624a03216b7d92d00351ae7fb3e"
++dependencies = [
++ "bitcoincore-rpc-json",
++ "jsonrpc",
++ "log",
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "bitcoincore-rpc-json"
++version = "0.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1"
++dependencies = [
++ "bitcoin",
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
++
++[[package]]
++name = "block-buffer"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
++dependencies = [
++ "block-padding",
++ "generic-array",
++]
++
++[[package]]
++name = "block-buffer"
++version = "0.10.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "block-padding"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
++
++[[package]]
++name = "blocking"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
++dependencies = [
++ "async-channel",
++ "async-task",
++ "atomic-waker",
++ "fastrand",
++ "futures-lite",
++ "once_cell",
++]
++
++[[package]]
++name = "bstr"
++version = "0.2.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "buf_redux"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
++dependencies = [
++ "memchr",
++ "safemem",
++]
++
++[[package]]
++name = "bumpalo"
++version = "3.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
++
++[[package]]
++name = "byteorder"
++version = "1.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
++
++[[package]]
++name = "bytes"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
++
++[[package]]
++name = "bytes"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
++
++[[package]]
++name = "cache-padded"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
++
++[[package]]
++name = "castaway"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
++
++[[package]]
++name = "cc"
++version = "1.0.73"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "chacha20"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1"
++dependencies = [
++ "cfg-if 1.0.0",
++ "cipher",
++ "cpufeatures",
++ "zeroize",
++]
++
++[[package]]
++name = "chacha20poly1305"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2"
++dependencies = [
++ "aead",
++ "chacha20",
++ "cipher",
++ "poly1305",
++ "zeroize",
++]
++
++[[package]]
++name = "chrono"
++version = "0.4.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
++dependencies = [
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "chunked_transfer"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
++
++[[package]]
++name = "cipher"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "clap"
++version = "2.34.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
++dependencies = [
++ "ansi_term",
++ "atty",
++ "bitflags",
++ "strsim",
++ "textwrap",
++ "unicode-width",
++ "vec_map",
++]
++
++[[package]]
++name = "cln-plugin"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2043841c090a404cb81b145c8ad3c66bae122ba722387fc322b93c157d596433"
++dependencies = [
++ "anyhow",
++ "bytes 1.2.1",
++ "cln-rpc",
++ "futures",
++ "log",
++ "serde",
++ "serde_json",
++ "tokio 1.21.2",
++ "tokio-stream",
++ "tokio-util 0.6.10",
++]
++
++[[package]]
++name = "cln-rpc"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "18fb71ceca239c83a06fb494028b4a6b7b38ad4dd9c0410b7ea6013b90e15045"
++dependencies = [
++ "anyhow",
++ "bytes 1.2.1",
++ "futures-util",
++ "hex",
++ "log",
++ "native-tls",
++ "serde",
++ "serde_json",
++ "tokio 1.21.2",
++ "tokio-util 0.6.10",
++]
++
++[[package]]
++name = "colored"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
++dependencies = [
++ "atty",
++ "lazy_static",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "concurrent-queue"
++version = "1.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
++dependencies = [
++ "cache-padded",
++]
++
++[[package]]
++name = "convert_case"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
++
++[[package]]
++name = "core-foundation"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
++
++[[package]]
++name = "cpufeatures"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "crunchy"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
++
++[[package]]
++name = "crypto-common"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
++dependencies = [
++ "generic-array",
++ "typenum",
++]
++
++[[package]]
++name = "crypto-mac"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
++dependencies = [
++ "generic-array",
++ "subtle",
++]
++
++[[package]]
++name = "ctor"
++version = "0.1.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
++dependencies = [
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "curl"
++version = "0.4.44"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
++dependencies = [
++ "curl-sys",
++ "libc",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "socket2 0.4.7",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "curl-sys"
++version = "0.4.56+curl-7.83.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f"
++dependencies = [
++ "cc",
++ "libc",
++ "libnghttp2-sys",
++ "libz-sys",
++ "openssl-sys",
++ "pkg-config",
++ "vcpkg",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "curve25519-dalek"
++version = "3.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
++dependencies = [
++ "byteorder",
++ "digest 0.9.0",
++ "rand_core 0.5.1",
++ "subtle",
++ "zeroize",
++]
++
++[[package]]
++name = "data-encoding"
++version = "2.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
++
++[[package]]
++name = "der-oid-macro"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436"
++dependencies = [
++ "num-bigint",
++ "num-traits",
++ "syn",
++]
++
++[[package]]
++name = "der-parser"
++version = "6.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2"
++dependencies = [
++ "der-oid-macro",
++ "nom",
++ "num-bigint",
++ "num-traits",
++ "rusticata-macros",
++]
++
++[[package]]
++name = "derive_more"
++version = "0.99.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
++dependencies = [
++ "convert_case",
++ "proc-macro2",
++ "quote",
++ "rustc_version",
++ "syn",
++]
++
++[[package]]
++name = "diff"
++version = "0.1.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
++
++[[package]]
++name = "digest"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "digest"
++version = "0.10.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
++dependencies = [
++ "block-buffer 0.10.3",
++ "crypto-common",
++]
++
++[[package]]
++name = "dirs-next"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
++dependencies = [
++ "cfg-if 1.0.0",
++ "dirs-sys-next",
++]
++
++[[package]]
++name = "dirs-sys-next"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
++dependencies = [
++ "libc",
++ "redox_users",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "ed25519"
++version = "1.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
++dependencies = [
++ "signature",
++]
++
++[[package]]
++name = "ed25519-dalek"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
++dependencies = [
++ "curve25519-dalek",
++ "ed25519",
++ "rand 0.7.3",
++ "serde",
++ "sha2",
++ "zeroize",
++]
++
++[[package]]
++name = "either"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
++
++[[package]]
++name = "ena"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
++dependencies = [
++ "log",
++]
++
++[[package]]
++name = "encoding_rs"
++version = "0.8.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "event-listener"
++version = "2.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
++
++[[package]]
++name = "fallible-iterator"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
++
++[[package]]
++name = "fallible-streaming-iterator"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
++
++[[package]]
++name = "fastrand"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
++dependencies = [
++ "instant",
++]
++
++[[package]]
++name = "fixedbitset"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
++
++[[package]]
++name = "fnv"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
++
++[[package]]
++name = "foreign-types"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
++dependencies = [
++ "foreign-types-shared",
++]
++
++[[package]]
++name = "foreign-types-shared"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
++dependencies = [
++ "percent-encoding",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++dependencies = [
++ "bitflags",
++ "fuchsia-zircon-sys",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++
++[[package]]
++name = "futures"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-executor",
++ "futures-io",
++ "futures-sink",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-channel"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
++dependencies = [
++ "futures-core",
++ "futures-sink",
++]
++
++[[package]]
++name = "futures-core"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
++
++[[package]]
++name = "futures-executor"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
++dependencies = [
++ "futures-core",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-io"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
++
++[[package]]
++name = "futures-lite"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
++dependencies = [
++ "fastrand",
++ "futures-core",
++ "futures-io",
++ "memchr",
++ "parking",
++ "pin-project-lite 0.2.9",
++ "waker-fn",
++]
++
++[[package]]
++name = "futures-macro"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "futures-sink"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
++
++[[package]]
++name = "futures-task"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
++
++[[package]]
++name = "futures-util"
++version = "0.3.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-io",
++ "futures-macro",
++ "futures-sink",
++ "futures-task",
++ "memchr",
++ "pin-project-lite 0.2.9",
++ "pin-utils",
++ "slab",
++]
++
++[[package]]
++name = "generic-array"
++version = "0.14.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
++dependencies = [
++ "typenum",
++ "version_check",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.9.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "wasi 0.11.0+wasi-snapshot-preview1",
++]
++
++[[package]]
++name = "globset"
++version = "0.4.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
++dependencies = [
++ "aho-corasick",
++ "bstr",
++ "fnv",
++ "log",
++ "regex",
++]
++
++[[package]]
++name = "gloo-timers"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "js-sys",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "h2"
++version = "0.2.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
++dependencies = [
++ "bytes 0.5.6",
++ "fnv",
++ "futures-core",
++ "futures-sink",
++ "futures-util",
++ "http",
++ "indexmap",
++ "slab",
++ "tokio 0.2.25",
++ "tokio-util 0.3.1",
++ "tracing",
++ "tracing-futures",
++]
++
++[[package]]
++name = "h2"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
++dependencies = [
++ "bytes 1.2.1",
++ "fnv",
++ "futures-core",
++ "futures-sink",
++ "futures-util",
++ "http",
++ "indexmap",
++ "slab",
++ "tokio 1.21.2",
++ "tokio-util 0.7.4",
++ "tracing",
++]
++
++[[package]]
++name = "hashbrown"
++version = "0.11.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
++dependencies = [
++ "ahash",
++]
++
++[[package]]
++name = "hashbrown"
++version = "0.12.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
++
++[[package]]
++name = "hashlink"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
++dependencies = [
++ "hashbrown 0.11.2",
++]
++
++[[package]]
++name = "headers"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
++dependencies = [
++ "base64",
++ "bitflags",
++ "bytes 1.2.1",
++ "headers-core",
++ "http",
++ "httpdate 1.0.2",
++ "mime",
++ "sha1",
++]
++
++[[package]]
++name = "headers-core"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
++dependencies = [
++ "http",
++]
++
++[[package]]
++name = "heck"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
++dependencies = [
++ "unicode-segmentation",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "hex"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "hmac"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
++dependencies = [
++ "crypto-mac",
++ "digest 0.9.0",
++]
++
++[[package]]
++name = "home"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "http"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
++dependencies = [
++ "bytes 1.2.1",
++ "fnv",
++ "itoa 1.0.3",
++]
++
++[[package]]
++name = "http-body"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
++dependencies = [
++ "bytes 0.5.6",
++ "http",
++]
++
++[[package]]
++name = "http-body"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
++dependencies = [
++ "bytes 1.2.1",
++ "http",
++ "pin-project-lite 0.2.9",
++]
++
++[[package]]
++name = "httparse"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
++
++[[package]]
++name = "httpdate"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
++
++[[package]]
++name = "httpdate"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
++
++[[package]]
++name = "httpmock"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd"
++dependencies = [
++ "assert-json-diff",
++ "async-object-pool",
++ "async-trait",
++ "base64",
++ "basic-cookies",
++ "crossbeam-utils",
++ "form_urlencoded",
++ "futures-util",
++ "hyper 0.14.20",
++ "isahc",
++ "lazy_static",
++ "levenshtein",
++ "log",
++ "regex",
++ "serde",
++ "serde_json",
++ "serde_regex",
++ "similar",
++ "tokio 1.21.2",
++ "url",
++]
++
++[[package]]
++name = "hyper"
++version = "0.13.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb"
++dependencies = [
++ "bytes 0.5.6",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "h2 0.2.7",
++ "http",
++ "http-body 0.3.1",
++ "httparse",
++ "httpdate 0.3.2",
++ "itoa 0.4.8",
++ "pin-project",
++ "socket2 0.3.19",
++ "tokio 0.2.25",
++ "tower-service",
++ "tracing",
++ "want",
++]
++
++[[package]]
++name = "hyper"
++version = "0.14.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
++dependencies = [
++ "bytes 1.2.1",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "h2 0.3.14",
++ "http",
++ "http-body 0.4.5",
++ "httparse",
++ "httpdate 1.0.2",
++ "itoa 1.0.3",
++ "pin-project-lite 0.2.9",
++ "socket2 0.4.7",
++ "tokio 1.21.2",
++ "tower-service",
++ "tracing",
++ "want",
++]
++
++[[package]]
++name = "hyper-timeout"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
++dependencies = [
++ "hyper 0.14.20",
++ "pin-project-lite 0.2.9",
++ "tokio 1.21.2",
++ "tokio-io-timeout",
++]
++
++[[package]]
++name = "hyper-tls"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
++dependencies = [
++ "bytes 1.2.1",
++ "hyper 0.14.20",
++ "native-tls",
++ "tokio 1.21.2",
++ "tokio-native-tls",
++]
++
++[[package]]
++name = "idna"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
++dependencies = [
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "indexmap"
++version = "1.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
++dependencies = [
++ "autocfg",
++ "hashbrown 0.12.3",
++]
++
++[[package]]
++name = "instant"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
++dependencies = [
++ "cfg-if 1.0.0",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "ipnet"
++version = "2.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
++
++[[package]]
++name = "isahc"
++version = "1.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
++dependencies = [
++ "async-channel",
++ "castaway",
++ "crossbeam-utils",
++ "curl",
++ "curl-sys",
++ "encoding_rs",
++ "event-listener",
++ "futures-lite",
++ "http",
++ "log",
++ "mime",
++ "once_cell",
++ "polling",
++ "slab",
++ "sluice",
++ "tracing",
++ "tracing-futures",
++ "url",
++ "waker-fn",
++]
++
++[[package]]
++name = "itertools"
++version = "0.10.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
++dependencies = [
++ "either",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
++
++[[package]]
++name = "itoa"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
++
++[[package]]
++name = "js-sys"
++version = "0.3.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
++dependencies = [
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "jsonrpc"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8"
++dependencies = [
++ "base64-compat",
++ "serde",
++ "serde_derive",
++ "serde_json",
++]
++
++[[package]]
++name = "jsonrpc-core"
++version = "17.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e"
++dependencies = [
++ "futures",
++ "futures-executor",
++ "futures-util",
++ "log",
++ "serde",
++ "serde_derive",
++ "serde_json",
++]
++
++[[package]]
++name = "jsonrpc-http-server"
++version = "17.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2"
++dependencies = [
++ "futures",
++ "hyper 0.13.10",
++ "jsonrpc-core",
++ "jsonrpc-server-utils",
++ "log",
++ "net2",
++ "parking_lot 0.11.2",
++ "unicase",
++]
++
++[[package]]
++name = "jsonrpc-server-utils"
++version = "17.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d"
++dependencies = [
++ "bytes 0.5.6",
++ "futures",
++ "globset",
++ "jsonrpc-core",
++ "lazy_static",
++ "log",
++ "tokio 0.2.25",
++ "tokio-util 0.3.1",
++ "unicase",
++]
++
++[[package]]
++name = "keccak"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
++
++[[package]]
++name = "kv-log-macro"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
++dependencies = [
++ "log",
++]
++
++[[package]]
++name = "lalrpop"
++version = "0.19.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
++dependencies = [
++ "ascii-canvas",
++ "atty",
++ "bit-set",
++ "diff",
++ "ena",
++ "itertools",
++ "lalrpop-util",
++ "petgraph",
++ "pico-args",
++ "regex",
++ "regex-syntax",
++ "string_cache",
++ "term",
++ "tiny-keccak",
++ "unicode-xid",
++]
++
++[[package]]
++name = "lalrpop-util"
++version = "0.19.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
++dependencies = [
++ "regex",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "levenshtein"
++version = "1.0.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
++
++[[package]]
++name = "libc"
++version = "0.2.133"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
++
++[[package]]
++name = "libnghttp2-sys"
++version = "0.1.7+1.45.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
++dependencies = [
++ "cc",
++ "libc",
++]
++
++[[package]]
++name = "libsqlite3-sys"
++version = "0.23.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58"
++dependencies = [
++ "cc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "libz-sys"
++version = "1.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
++dependencies = [
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "lightning"
++version = "0.0.108"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d885bf509066af86ae85354c8959028ad6192c22a2657ef8271e94029d30f9d0"
++dependencies = [
++ "bitcoin",
++]
++
++[[package]]
++name = "lightning-block-sync"
++version = "0.0.108"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8f1ed50f41785af19f5cd1225b668e87ef0d59bb84e6f8ef2542933e6082a2c"
++dependencies = [
++ "bitcoin",
++ "chunked_transfer",
++ "futures",
++ "lightning",
++ "serde",
++ "serde_json",
++]
++
++[[package]]
++name = "lightning-net-tokio"
++version = "0.0.108"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2f0170619152c4d6b947d5ed0de427b85691482a293e0cae52d4336a2220a776"
++dependencies = [
++ "bitcoin",
++ "lightning",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "lock_api"
++version = "0.4.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
++dependencies = [
++ "autocfg",
++ "scopeguard",
++]
++
++[[package]]
++name = "log"
++version = "0.4.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
++dependencies = [
++ "cfg-if 1.0.0",
++ "value-bag",
++]
++
++[[package]]
++name = "memchr"
++version = "2.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
++
++[[package]]
++name = "mime"
++version = "0.3.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
++
++[[package]]
++name = "mime_guess"
++version = "2.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++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 = "mio"
++version = "0.6.23"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
++dependencies = [
++ "cfg-if 0.1.10",
++ "fuchsia-zircon",
++ "fuchsia-zircon-sys",
++ "iovec",
++ "kernel32-sys",
++ "libc",
++ "log",
++ "miow",
++ "net2",
++ "slab",
++ "winapi 0.2.8",
++]
++
++[[package]]
++name = "mio"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
++dependencies = [
++ "libc",
++ "log",
++ "wasi 0.11.0+wasi-snapshot-preview1",
++ "windows-sys",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
++dependencies = [
++ "kernel32-sys",
++ "net2",
++ "winapi 0.2.8",
++ "ws2_32-sys",
++]
++
++[[package]]
++name = "multimap"
++version = "0.8.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
++
++[[package]]
++name = "multipart"
++version = "0.18.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182"
++dependencies = [
++ "buf_redux",
++ "httparse",
++ "log",
++ "mime",
++ "mime_guess",
++ "quick-error",
++ "rand 0.8.5",
++ "safemem",
++ "tempfile",
++ "twoway",
++]
++
++[[package]]
++name = "native-tls"
++version = "0.2.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
++dependencies = [
++ "lazy_static",
++ "libc",
++ "log",
++ "openssl",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "security-framework",
++ "security-framework-sys",
++ "tempfile",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
++dependencies = [
++ "cfg-if 0.1.10",
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "new_debug_unreachable"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
++
++[[package]]
++name = "nom"
++version = "7.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
++dependencies = [
++ "memchr",
++ "minimal-lexical",
++]
++
++[[package]]
++name = "num-bigint"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
++dependencies = [
++ "autocfg",
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.45"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
++dependencies = [
++ "autocfg",
++ "num-traits",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.13.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "num_threads"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "oid-registry"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815"
++dependencies = [
++ "der-parser",
++]
++
++[[package]]
++name = "once_cell"
++version = "1.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
++
++[[package]]
++name = "opaque-debug"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
++
++[[package]]
++name = "openssl"
++version = "0.10.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
++dependencies = [
++ "bitflags",
++ "cfg-if 1.0.0",
++ "foreign-types",
++ "libc",
++ "once_cell",
++ "openssl-macros",
++ "openssl-sys",
++]
++
++[[package]]
++name = "openssl-macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++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-src"
++version = "111.22.0+1.1.1q"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.76"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
++dependencies = [
++ "autocfg",
++ "cc",
++ "libc",
++ "openssl-src",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "parking"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
++
++[[package]]
++name = "parking_lot"
++version = "0.11.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
++dependencies = [
++ "instant",
++ "lock_api",
++ "parking_lot_core 0.8.5",
++]
++
++[[package]]
++name = "parking_lot"
++version = "0.12.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
++dependencies = [
++ "lock_api",
++ "parking_lot_core 0.9.3",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
++dependencies = [
++ "cfg-if 1.0.0",
++ "instant",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "windows-sys",
++]
++
++[[package]]
++name = "pem"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
++dependencies = [
++ "base64",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
++
++[[package]]
++name = "petgraph"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
++dependencies = [
++ "fixedbitset",
++ "indexmap",
++]
++
++[[package]]
++name = "phf_shared"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
++dependencies = [
++ "siphasher",
++]
++
++[[package]]
++name = "pico-args"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
++
++[[package]]
++name = "pin-project"
++version = "1.0.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
++dependencies = [
++ "pin-project-internal",
++]
++
++[[package]]
++name = "pin-project-internal"
++version = "1.0.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pin-project-lite"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
++
++[[package]]
++name = "pin-project-lite"
++version = "0.2.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
++
++[[package]]
++name = "pin-utils"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
++
++[[package]]
++name = "polling"
++version = "2.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
++dependencies = [
++ "autocfg",
++ "cfg-if 1.0.0",
++ "libc",
++ "log",
++ "wepoll-ffi",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "poly1305"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
++dependencies = [
++ "cpufeatures",
++ "opaque-debug",
++ "universal-hash",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
++
++[[package]]
++name = "precomputed-hash"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
++
++[[package]]
++name = "proc-macro-error"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
++dependencies = [
++ "proc-macro-error-attr",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "version_check",
++]
++
++[[package]]
++name = "proc-macro-error-attr"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "version_check",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
++dependencies = [
++ "unicode-ident",
++]
++
++[[package]]
++name = "prost"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
++dependencies = [
++ "bytes 1.2.1",
++ "prost-derive 0.8.0",
++]
++
++[[package]]
++name = "prost"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
++dependencies = [
++ "bytes 1.2.1",
++ "prost-derive 0.9.0",
++]
++
++[[package]]
++name = "prost-build"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
++dependencies = [
++ "bytes 1.2.1",
++ "heck",
++ "itertools",
++ "lazy_static",
++ "log",
++ "multimap",
++ "petgraph",
++ "prost 0.9.0",
++ "prost-types",
++ "regex",
++ "tempfile",
++ "which",
++]
++
++[[package]]
++name = "prost-derive"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
++dependencies = [
++ "anyhow",
++ "itertools",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "prost-derive"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
++dependencies = [
++ "anyhow",
++ "itertools",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "prost-types"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
++dependencies = [
++ "bytes 1.2.1",
++ "prost 0.9.0",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
++
++[[package]]
++name = "quote"
++version = "1.0.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
++dependencies = [
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "rdrand",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++dependencies = [
++ "getrandom 0.1.16",
++ "libc",
++ "rand_chacha 0.2.2",
++ "rand_core 0.5.1",
++ "rand_hc",
++]
++
++[[package]]
++name = "rand"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
++dependencies = [
++ "libc",
++ "rand_chacha 0.3.1",
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.5.1",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
++dependencies = [
++ "ppv-lite86",
++ "rand_core 0.6.4",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++dependencies = [
++ "rand_core 0.4.2",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++dependencies = [
++ "getrandom 0.1.16",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
++dependencies = [
++ "getrandom 0.2.7",
++]
++
++[[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 = "rcgen"
++version = "0.8.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7"
++dependencies = [
++ "chrono",
++ "pem",
++ "ring",
++ "x509-parser",
++ "yasna",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++dependencies = [
++ "rand_core 0.3.1",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.2.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "redox_users"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
++dependencies = [
++ "getrandom 0.2.7",
++ "redox_syscall",
++ "thiserror",
++]
++
++[[package]]
++name = "regex"
++version = "1.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "reqwest"
++version = "0.11.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc"
++dependencies = [
++ "base64",
++ "bytes 1.2.1",
++ "encoding_rs",
++ "futures-core",
++ "futures-util",
++ "h2 0.3.14",
++ "http",
++ "http-body 0.4.5",
++ "hyper 0.14.20",
++ "hyper-tls",
++ "ipnet",
++ "js-sys",
++ "log",
++ "mime",
++ "native-tls",
++ "once_cell",
++ "percent-encoding",
++ "pin-project-lite 0.2.9",
++ "serde",
++ "serde_json",
++ "serde_urlencoded",
++ "tokio 1.21.2",
++ "tokio-native-tls",
++ "tokio-socks",
++ "tower-service",
++ "url",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++ "winreg",
++]
++
++[[package]]
++name = "ring"
++version = "0.16.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
++dependencies = [
++ "cc",
++ "libc",
++ "once_cell",
++ "spin",
++ "untrusted",
++ "web-sys",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "rusqlite"
++version = "0.26.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7"
++dependencies = [
++ "bitflags",
++ "fallible-iterator",
++ "fallible-streaming-iterator",
++ "hashlink",
++ "libsqlite3-sys",
++ "memchr",
++ "smallvec",
++]
++
++[[package]]
++name = "rustc_version"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
++dependencies = [
++ "semver",
++]
++
++[[package]]
++name = "rusticata-macros"
++version = "4.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
++dependencies = [
++ "nom",
++]
++
++[[package]]
++name = "rustls"
++version = "0.19.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
++dependencies = [
++ "base64",
++ "log",
++ "ring",
++ "sct",
++ "webpki",
++]
++
++[[package]]
++name = "rustls-pemfile"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
++dependencies = [
++ "base64",
++]
++
++[[package]]
++name = "rustversion"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
++
++[[package]]
++name = "ryu"
++version = "1.0.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
++
++[[package]]
++name = "safemem"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
++
++[[package]]
++name = "schannel"
++version = "0.1.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
++dependencies = [
++ "lazy_static",
++ "windows-sys",
++]
++
++[[package]]
++name = "scoped-tls"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "sct"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
++dependencies = [
++ "ring",
++ "untrusted",
++]
++
++[[package]]
++name = "secp256k1"
++version = "0.22.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
++dependencies = [
++ "secp256k1-sys",
++ "serde",
++]
++
++[[package]]
++name = "secp256k1-sys"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110"
++dependencies = [
++ "cc",
++]
++
++[[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",
++ "libc",
++ "security-framework-sys",
++]
++
++[[package]]
++name = "security-framework-sys"
++version = "2.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
++[[package]]
++name = "semver"
++version = "1.0.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
++
++[[package]]
++name = "serde"
++version = "1.0.145"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.145"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.85"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
++dependencies = [
++ "indexmap",
++ "itoa 1.0.3",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "serde_regex"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf"
++dependencies = [
++ "regex",
++ "serde",
++]
++
++[[package]]
++name = "serde_urlencoded"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
++dependencies = [
++ "form_urlencoded",
++ "itoa 1.0.3",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "sha-1"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
++dependencies = [
++ "cfg-if 1.0.0",
++ "cpufeatures",
++ "digest 0.10.5",
++]
++
++[[package]]
++name = "sha1"
++version = "0.10.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
++dependencies = [
++ "cfg-if 1.0.0",
++ "cpufeatures",
++ "digest 0.10.5",
++]
++
++[[package]]
++name = "sha2"
++version = "0.9.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
++dependencies = [
++ "block-buffer 0.9.0",
++ "cfg-if 1.0.0",
++ "cpufeatures",
++ "digest 0.9.0",
++ "opaque-debug",
++]
++
++[[package]]
++name = "sha3"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
++dependencies = [
++ "block-buffer 0.9.0",
++ "digest 0.9.0",
++ "keccak",
++ "opaque-debug",
++]
++
++[[package]]
++name = "signal-hook"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
++dependencies = [
++ "libc",
++ "signal-hook-registry",
++]
++
++[[package]]
++name = "signal-hook-registry"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "signature"
++version = "1.6.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9"
++
++[[package]]
++name = "similar"
++version = "2.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
++
++[[package]]
++name = "simple_logger"
++version = "2.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7"
++dependencies = [
++ "atty",
++ "colored",
++ "log",
++ "time",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "siphasher"
++version = "0.3.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
++
++[[package]]
++name = "slab"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "sluice"
++version = "0.5.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
++dependencies = [
++ "async-channel",
++ "futures-core",
++ "futures-io",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
++
++[[package]]
++name = "socket2"
++version = "0.3.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
++dependencies = [
++ "cfg-if 1.0.0",
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "socket2"
++version = "0.4.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
++dependencies = [
++ "libc",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "spin"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
++
++[[package]]
++name = "string_cache"
++version = "0.8.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
++dependencies = [
++ "new_debug_unreachable",
++ "once_cell",
++ "parking_lot 0.12.1",
++ "phf_shared",
++ "precomputed-hash",
++]
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++
++[[package]]
++name = "structopt"
++version = "0.3.26"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
++dependencies = [
++ "clap",
++ "lazy_static",
++ "structopt-derive",
++]
++
++[[package]]
++name = "structopt-derive"
++version = "0.4.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
++dependencies = [
++ "heck",
++ "proc-macro-error",
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "subtle"
++version = "2.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
++
++[[package]]
++name = "syn"
++version = "1.0.101"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
++name = "synstructure"
++version = "0.12.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tempdir"
++version = "0.3.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
++dependencies = [
++ "rand 0.4.6",
++ "remove_dir_all",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
++dependencies = [
++ "cfg-if 1.0.0",
++ "fastrand",
++ "libc",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "teos"
++version = "0.1.2"
++dependencies = [
++ "bitcoin",
++ "bitcoincore-rpc",
++ "hex",
++ "home",
++ "jsonrpc-http-server",
++ "lightning",
++ "lightning-block-sync",
++ "lightning-net-tokio",
++ "log",
++ "prost 0.9.0",
++ "rand 0.8.5",
++ "rcgen",
++ "rusqlite",
++ "serde",
++ "serde_json",
++ "simple_logger",
++ "structopt",
++ "tempdir",
++ "teos-common",
++ "tokio 1.21.2",
++ "tokio-stream",
++ "toml",
++ "tonic 0.6.2",
++ "tonic-build",
++ "torut",
++ "triggered",
++ "warp",
++]
++
++[[package]]
++name = "teos-common"
++version = "0.1.2"
++dependencies = [
++ "bitcoin",
++ "chacha20poly1305",
++ "hex",
++ "lightning",
++ "prost 0.9.0",
++ "rand 0.8.5",
++ "rusqlite",
++ "serde",
++ "serde_json",
++ "tonic 0.6.2",
++ "tonic-build",
++]
++
++[[package]]
++name = "term"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
++dependencies = [
++ "dirs-next",
++ "rustversion",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
++dependencies = [
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "time"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
++dependencies = [
++ "itoa 1.0.3",
++ "libc",
++ "num_threads",
++ "time-macros",
++]
++
++[[package]]
++name = "time-macros"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
++
++[[package]]
++name = "tiny-keccak"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
++dependencies = [
++ "crunchy",
++]
++
++[[package]]
++name = "tinyvec"
++version = "1.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
++
++[[package]]
++name = "tokio"
++version = "0.2.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
++dependencies = [
++ "bytes 0.5.6",
++ "fnv",
++ "futures-core",
++ "iovec",
++ "lazy_static",
++ "memchr",
++ "mio 0.6.23",
++ "num_cpus",
++ "pin-project-lite 0.1.12",
++ "slab",
++]
++
++[[package]]
++name = "tokio"
++version = "1.21.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
++dependencies = [
++ "autocfg",
++ "bytes 1.2.1",
++ "libc",
++ "memchr",
++ "mio 0.8.4",
++ "num_cpus",
++ "pin-project-lite 0.2.9",
++ "signal-hook-registry",
++ "socket2 0.4.7",
++ "tokio-macros",
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "tokio-io-timeout"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
++dependencies = [
++ "pin-project-lite 0.2.9",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tokio-macros"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "tokio-native-tls"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
++dependencies = [
++ "native-tls",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tokio-rustls"
++version = "0.22.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
++dependencies = [
++ "rustls",
++ "tokio 1.21.2",
++ "webpki",
++]
++
++[[package]]
++name = "tokio-socks"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
++dependencies = [
++ "either",
++ "futures-util",
++ "thiserror",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tokio-stream"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
++dependencies = [
++ "futures-core",
++ "pin-project-lite 0.2.9",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tokio-tungstenite"
++version = "0.17.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
++dependencies = [
++ "futures-util",
++ "log",
++ "tokio 1.21.2",
++ "tungstenite",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
++dependencies = [
++ "bytes 0.5.6",
++ "futures-core",
++ "futures-sink",
++ "log",
++ "pin-project-lite 0.1.12",
++ "tokio 0.2.25",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.6.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
++dependencies = [
++ "bytes 1.2.1",
++ "futures-core",
++ "futures-sink",
++ "log",
++ "pin-project-lite 0.2.9",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
++dependencies = [
++ "bytes 1.2.1",
++ "futures-core",
++ "futures-sink",
++ "pin-project-lite 0.2.9",
++ "tokio 1.21.2",
++ "tracing",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "tonic"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c"
++dependencies = [
++ "async-stream",
++ "async-trait",
++ "base64",
++ "bytes 1.2.1",
++ "futures-core",
++ "futures-util",
++ "h2 0.3.14",
++ "http",
++ "http-body 0.4.5",
++ "hyper 0.14.20",
++ "hyper-timeout",
++ "percent-encoding",
++ "pin-project",
++ "prost 0.8.0",
++ "prost-derive 0.8.0",
++ "tokio 1.21.2",
++ "tokio-rustls",
++ "tokio-stream",
++ "tokio-util 0.6.10",
++ "tower",
++ "tower-layer",
++ "tower-service",
++ "tracing",
++ "tracing-futures",
++]
++
++[[package]]
++name = "tonic"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
++dependencies = [
++ "async-stream",
++ "async-trait",
++ "base64",
++ "bytes 1.2.1",
++ "futures-core",
++ "futures-util",
++ "h2 0.3.14",
++ "http",
++ "http-body 0.4.5",
++ "hyper 0.14.20",
++ "hyper-timeout",
++ "percent-encoding",
++ "pin-project",
++ "prost 0.9.0",
++ "prost-derive 0.9.0",
++ "tokio 1.21.2",
++ "tokio-rustls",
++ "tokio-stream",
++ "tokio-util 0.6.10",
++ "tower",
++ "tower-layer",
++ "tower-service",
++ "tracing",
++ "tracing-futures",
++]
++
++[[package]]
++name = "tonic-build"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
++dependencies = [
++ "proc-macro2",
++ "prost-build",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "torut"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99febc413f26cf855b3a309c5872edff5c31e0ffe9c2fce5681868761df36f69"
++dependencies = [
++ "base32",
++ "base64",
++ "derive_more",
++ "ed25519-dalek",
++ "hex",
++ "hmac",
++ "rand 0.7.3",
++ "serde",
++ "serde_derive",
++ "sha2",
++ "sha3",
++ "tokio 1.21.2",
++]
++
++[[package]]
++name = "tower"
++version = "0.4.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
++dependencies = [
++ "futures-core",
++ "futures-util",
++ "indexmap",
++ "pin-project",
++ "pin-project-lite 0.2.9",
++ "rand 0.8.5",
++ "slab",
++ "tokio 1.21.2",
++ "tokio-util 0.7.4",
++ "tower-layer",
++ "tower-service",
++ "tracing",
++]
++
++[[package]]
++name = "tower-layer"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
++
++[[package]]
++name = "tower-service"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
++
++[[package]]
++name = "tracing"
++version = "0.1.36"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
++dependencies = [
++ "cfg-if 1.0.0",
++ "log",
++ "pin-project-lite 0.2.9",
++ "tracing-attributes",
++ "tracing-core",
++]
++
++[[package]]
++name = "tracing-attributes"
++version = "0.1.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "tracing-core"
++version = "0.1.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
++dependencies = [
++ "once_cell",
++]
++
++[[package]]
++name = "tracing-futures"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
++dependencies = [
++ "pin-project",
++ "tracing",
++]
++
++[[package]]
++name = "triggered"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1"
++
++[[package]]
++name = "try-lock"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
++
++[[package]]
++name = "tungstenite"
++version = "0.17.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
++dependencies = [
++ "base64",
++ "byteorder",
++ "bytes 1.2.1",
++ "http",
++ "httparse",
++ "log",
++ "rand 0.8.5",
++ "sha-1",
++ "thiserror",
++ "url",
++ "utf-8",
++]
++
++[[package]]
++name = "twoway"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "typenum"
++version = "1.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
++
++[[package]]
++name = "unicase"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
++dependencies = [
++ "version_check",
++]
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
++
++[[package]]
++name = "unicode-ident"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
++dependencies = [
++ "tinyvec",
++]
++
++[[package]]
++name = "unicode-segmentation"
++version = "1.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
++
++[[package]]
++name = "unicode-width"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
++
++[[package]]
++name = "universal-hash"
++version = "0.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
++dependencies = [
++ "generic-array",
++ "subtle",
++]
++
++[[package]]
++name = "untrusted"
++version = "0.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
++
++[[package]]
++name = "url"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
++dependencies = [
++ "form_urlencoded",
++ "idna",
++ "percent-encoding",
++]
++
++[[package]]
++name = "utf-8"
++version = "0.7.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
++
++[[package]]
++name = "value-bag"
++version = "1.0.0-alpha.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
++dependencies = [
++ "ctor",
++ "version_check",
++]
++
++[[package]]
++name = "vcpkg"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
++
++[[package]]
++name = "vec_map"
++version = "0.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
++
++[[package]]
++name = "version_check"
++version = "0.9.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
++
++[[package]]
++name = "waker-fn"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
++
++[[package]]
++name = "want"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
++dependencies = [
++ "log",
++ "try-lock",
++]
++
++[[package]]
++name = "warp"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d"
++dependencies = [
++ "bytes 1.2.1",
++ "futures-channel",
++ "futures-util",
++ "headers",
++ "http",
++ "hyper 0.14.20",
++ "log",
++ "mime",
++ "mime_guess",
++ "multipart",
++ "percent-encoding",
++ "pin-project",
++ "rustls-pemfile",
++ "scoped-tls",
++ "serde",
++ "serde_json",
++ "serde_urlencoded",
++ "tokio 1.21.2",
++ "tokio-stream",
++ "tokio-tungstenite",
++ "tokio-util 0.7.4",
++ "tower-service",
++ "tracing",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "wasi"
++version = "0.11.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
++dependencies = [
++ "cfg-if 1.0.0",
++ "wasm-bindgen-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
++dependencies = [
++ "bumpalo",
++ "log",
++ "once_cell",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-futures"
++version = "0.4.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
++dependencies = [
++ "cfg-if 1.0.0",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
++
++[[package]]
++name = "watchtower-plugin"
++version = "0.1.2"
++dependencies = [
++ "backoff",
++ "bitcoin",
++ "cln-plugin",
++ "hex",
++ "home",
++ "httpmock",
++ "log",
++ "reqwest",
++ "rusqlite",
++ "serde",
++ "serde_json",
++ "tempdir",
++ "teos-common",
++ "tokio 1.21.2",
++ "tonic 0.5.2",
++]
++
++[[package]]
++name = "web-sys"
++version = "0.3.60"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "webpki"
++version = "0.21.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
++dependencies = [
++ "ring",
++ "untrusted",
++]
++
++[[package]]
++name = "wepoll-ffi"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "which"
++version = "4.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
++dependencies = [
++ "either",
++ "libc",
++ "once_cell",
++]
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++
++[[package]]
++name = "winapi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "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.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
++dependencies = [
++ "winapi 0.3.9",
++]
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
++
++[[package]]
++name = "x509-parser"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed"
++dependencies = [
++ "base64",
++ "chrono",
++ "data-encoding",
++ "der-parser",
++ "lazy_static",
++ "nom",
++ "oid-registry",
++ "ring",
++ "rusticata-macros",
++ "thiserror",
++]
++
++[[package]]
++name = "yasna"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75"
++dependencies = [
++ "chrono",
++]
++
++[[package]]
++name = "zeroize"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
++dependencies = [
++ "zeroize_derive",
++]
++
++[[package]]
++name = "zeroize_derive"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++ "synstructure",
++]
diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix
new file mode 100644
index 00000000000..197246770d0
--- /dev/null
+++ b/pkgs/applications/blockchains/teos/default.nix
@@ -0,0 +1,80 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+, llvmPackages
+, openssl
+, perl
+, protobuf
+, rustfmt
+, Security
+, SystemConfiguration
+}:
+
+let
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "talaia-labs";
+ repo = "rust-teos";
+ rev = "v${version}";
+ hash = "sha256-N+srREYsADMTqz3uDXpeCuXrZZ62FopXO7DClGfyk9U=";
+ };
+
+ common.meta = with lib; {
+ homepage = "https://github.com/talaia-labs/rust-teos";
+ license = licenses.mit;
+ maintainers = with maintainers; [ seberm ];
+ platforms = platforms.unix;
+ };
+
+ cargoPatches = [ ./add-cargo-lock.patch ];
+
+ buildInputs = [
+ openssl
+ ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
+
+ nativeBuildInputs = [
+ perl # used by openssl-sys to configure
+ protobuf
+ rustfmt
+ llvmPackages.clang
+ ];
+
+
+ LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+in
+{
+ teos = rustPlatform.buildRustPackage {
+ pname = "teos";
+ cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc=";
+ buildAndTestSubdir = "teos";
+
+ inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH;
+
+ meta = common.meta // {
+ description = "A Lightning watchtower compliant with BOLT13, written in Rust";
+ };
+
+ cargoTestFlags = [
+ "--workspace"
+ ];
+ };
+
+ teos-watchtower-plugin = rustPlatform.buildRustPackage {
+ pname = "teos-watchtower-plugin";
+ cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM=";
+ buildAndTestSubdir = "watchtower-plugin";
+
+ inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH;
+
+ meta = common.meta // {
+ description = "A Lightning watchtower plugin for clightning";
+ };
+
+ # The test is skipped due to following error:
+ # thread 'retrier::tests::test_manage_retry_unreachable' panicked at 'assertion failed:
+ # wt_client.lock().unwrap().towers.get(&tower_id).unwrap().status.is_unreachable()', watchtower-plugin/src/retrier.rs:518:9
+ checkFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--skip=retrier::tests::test_manage_retry_unreachable" ];
+ };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
index 6482d46d387..c43d0d77654 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix
@@ -1,7 +1,6 @@
{ trivialBuild
, lib
, fetchFromGitHub
-, curl
, plz
, cl-lib
, ts
diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
index 5eaee9bbfdf..7809dcd7356 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, trivialBuild
+{ trivialBuild
, fetchFromGitHub
, emacs
, popup
diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
index 503554412b5..b8bbe7db577 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, fetchFromGitHub
, emacs
, trivialBuild
diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
index 6251fd6932a..d5283da41df 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, fetchFromGitHub
, trivialBuild
, emacs
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
index 1dcf27e64eb..735e18f6b68 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, trivialBuild
+{ trivialBuild
, fetchFromGitHub
, emacs
}:
diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
index d02283f25ad..bd6a2996d6e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, trivialBuild
+{ trivialBuild
, fetchFromGitHub
, emacs
}:
diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
index 7b57d69d559..e6e645a3b3a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, fetchFromGitHub
, trivialBuild
, emacs
diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix
index ece5c95f05a..ba9e941f389 100644
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -1,7 +1,6 @@
{ symlinkJoin
, makeWrapper
, geany
-, lndir
, vte
}:
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index ea0a1e2f247..063833ceaa1 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -1,6 +1,6 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools
-, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }:
+, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }:
let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index 8a6dc4e0073..c5265aa255c 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
, callPackage
, runCommand
, makeWrapper
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
index 7ede04427b5..fc6254f27e8 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix
@@ -1,4 +1,4 @@
-{ lib, octave, python3Packages }:
+{ lib, python3Packages }:
with python3Packages;
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
index 0675ceaba96..5587c2c0243 100644
--- a/pkgs/applications/editors/nano/nanorc/default.nix
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts
-, coreutils, git, gnused, nix, nixfmt }:
+{ lib, stdenv, fetchFromGitHub, writeScript, common-updater-scripts
+, coreutils, git, gnused, nix }:
let
owner = "scopatz";
diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix
index f6013202baf..b9d0ab4ec23 100644
--- a/pkgs/applications/editors/neovim/neovim-qt.nix
+++ b/pkgs/applications/editors/neovim/neovim-qt.nix
@@ -1,5 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
-, msgpack, neovim, python3Packages, qtbase, qtsvg }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }:
mkDerivation rec {
pname = "neovim-qt-unwrapped";
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 4f204fd7dbc..0502e79cb5d 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -1,7 +1,5 @@
{ stdenv, symlinkJoin, lib, makeWrapper
, writeText
-, bundlerEnv, ruby
-, nodejs
, nodePackages
, python3
, python3Packages
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 7525b41508c..409f99e37af 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -1,6 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper
-, boost, xercesc, hunspell, zlib, pcre16
-, qtbase, qttools, qtwebengine, qtxmlpatterns
+, boost, xercesc, qtbase, qttools, qtwebengine, qtxmlpatterns
, python3Packages
}:
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 71c0f3bb55e..d140d7d569f 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -2,7 +2,6 @@
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper
, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap
-, writeShellScriptBin
# Populate passthru.tests
, tests
diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix
index 4424bedc6f2..ce0ea6d6de8 100644
--- a/pkgs/applications/emulators/mgba/default.nix
+++ b/pkgs/applications/emulators/mgba/default.nix
@@ -3,12 +3,14 @@
, fetchFromGitHub
, SDL2
, cmake
-, libepoxy
-, ffmpeg_4
+, copyDesktopItems
+, ffmpeg
, imagemagick
, libedit
, libelf
+, libepoxy
, libzip
+, lua
, makeDesktopItem
, minizip
, pkg-config
@@ -18,31 +20,33 @@
, wrapQtAppsHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "mgba";
- version = "0.9.3";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "mgba-emu";
repo = "mgba";
- rev = version;
- hash = "sha256-0ZtoyyoD+YjplJlPFpZgIg5119j/6X8ZaSZP+UpX5K0=";
+ rev = finalAttrs.version;
+ hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI=";
};
nativeBuildInputs = [
cmake
+ copyDesktopItems
pkg-config
wrapQtAppsHook
];
buildInputs = [
SDL2
- libepoxy
- ffmpeg_4
+ ffmpeg
imagemagick
libedit
libelf
+ libepoxy
libzip
+ lua
minizip
qtbase
qtmultimedia
@@ -79,9 +83,9 @@ stdenv.mkDerivation rec {
runners, and a modern feature set for emulators that older emulators may
not support.
'';
+ changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES";
license = licenses.mpl20;
maintainers = with maintainers; [ MP2E AndersonTorres ];
platforms = platforms.linux;
};
-}
-# TODO: use desktopItem functions
+})
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index a702eb54c13..db7278c23bd 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -20,7 +20,6 @@
, Cocoa
, unixODBC
, poppler
-, hdf4
, hdf5
, netcdf
, sqlite
diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix
index dcaabed6b19..7b96dc1f793 100644
--- a/pkgs/applications/graphics/ciano/default.nix
+++ b/pkgs/applications/graphics/ciano/default.nix
@@ -3,14 +3,9 @@
, fetchFromGitHub
, desktop-file-utils
, ffmpeg
-, gobject-introspection
, granite
, gtk
, imagemagick
-, libgee
-, libhandy
-, libsecret
-, libsoup
, meson
, ninja
, pkg-config
diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix
new file mode 100644
index 00000000000..2e59c6716b7
--- /dev/null
+++ b/pkgs/applications/graphics/cyan/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, qt5
+, cmake
+, pkg-config
+, imagemagick
+, nix-update-script
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cyan";
+ version = "1.2.4";
+
+ src = fetchFromGitHub {
+ owner = "rodlie";
+ repo = pname;
+ rev = version;
+ hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ qt5.wrapQtAppsHook
+ ];
+
+ buildInputs = [ imagemagick ];
+
+ passthru.updateScript = nix-update-script {
+ attrPath = pname;
+ };
+
+ meta = with lib; {
+ description = "Image viewer and converter, designed for prepress (print) work";
+ homepage = "https://github.com/rodlie/cyan";
+ mainProgram = "Cyan";
+ license = licenses.cecill21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ zendo ];
+ };
+}
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 17537083aae..0cc93bbbe8a 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -2,7 +2,6 @@
, stdenv
, mkDerivation
, fetchFromGitHub
-, fetchpatch
, cmake
, ninja
, GitPython
diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix
index bc608c6735f..9c854d9ffbf 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/pkgs/applications/graphics/ideogram/default.nix
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
-, fetchpatch
, vala
, pkg-config
, python3
diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix
index af1bc78ac32..5988627d401 100644
--- a/pkgs/applications/graphics/imgbrd-grabber/default.nix
+++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix
@@ -4,12 +4,9 @@
, wrapQtAppsHook
, qtmultimedia
, qttools
-, qtscript
, qtdeclarative
, qtnetworkauth
, qtbase
-, autogen
-, automake
, makeWrapper
, catch2
, nodejs
diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix
index 21ba5d51375..a9b00018471 100644
--- a/pkgs/applications/graphics/krita/generic.nix
+++ b/pkgs/applications/graphics/krita/generic.nix
@@ -6,11 +6,9 @@
, openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp
, qtmultimedia, qtx11extras, quazip
, python3Packages
-
, version
, kde-channel
, sha256
-
, callPackage
}:
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index fb47a304f22..86aed684db0 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, patchelf, fetchurl, p7zip
+{ lib, stdenv, fetchurl, p7zip
, nss, nspr, libusb1
, qtbase, qtmultimedia, qtserialport
, autoPatchelfHook, wrapQtAppsHook
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 1087bba9705..b1c4f2258f0 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, fetchurl
+{ lib, fetchFromGitLab, fetchurl
, boost, cmake, ffmpeg, qtbase, qtx11extras
, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper
, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 587a078e066..962f6dc97ac 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
+{lib, stdenv, fetchFromGitHub, flex, bison, cmake, zlib}:
stdenv.mkDerivation {
version = "2018-08-15";
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 52e38b23c1f..767b749ef73 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch
, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
-, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil
-}:
+, extra-cmake-modules, poppler, kimageformats, libarchive}:
mkDerivation rec {
pname = "photoqt";
diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix
index 97a3684682d..58a52aee494 100644
--- a/pkgs/applications/graphics/pikopixel/default.nix
+++ b/pkgs/applications/graphics/pikopixel/default.nix
@@ -1,7 +1,6 @@
{ lib
, fetchurl
, gnustep
-, gcc
, llvmPackages_9
}:
diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix
index deed3d3b888..8e4c4805750 100644
--- a/pkgs/applications/graphics/qimgv/default.nix
+++ b/pkgs/applications/graphics/qimgv/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation
, lib
, fetchFromGitHub
-, fetchpatch
, cmake
, pkg-config
diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix
index d8f1ae76a88..cb57f87fc66 100644
--- a/pkgs/applications/graphics/veusz/default.nix
+++ b/pkgs/applications/graphics/veusz/default.nix
@@ -1,6 +1,5 @@
{ python3Packages
, qtbase
-, ghostscript
, wrapQtAppsHook
, lib
}:
diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix
index 8e0caff1d17..1b0b2a1516f 100644
--- a/pkgs/applications/graphics/vimiv-qt/default.nix
+++ b/pkgs/applications/graphics/vimiv-qt/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, lib
+{ lib
, fetchFromGitHub
, python3
, qt5
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index e656d36a1c9..94c948c1c4e 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, kdepimTeam, substituteAll,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 508f7e79f55..b708cb1bd59 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,4 @@
-{ mkDerivation, lib, config
-, extra-cmake-modules, kdoctools
+{ mkDerivation, lib, extra-cmake-modules, kdoctools
, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
, libarchive, libzip
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
index c7ef5c4615c..24f93ee0af7 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, kdepimTeam, fetchpatch,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils,
kholidays, kidentitymanagement, kmime, pimcommon, qttools,
diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix
index 63639800d5f..51203271b1f 100644
--- a/pkgs/applications/kde/elisa.nix
+++ b/pkgs/applications/kde/elisa.nix
@@ -1,5 +1,4 @@
{ mkDerivation
-, fetchFromGitHub
, lib
, extra-cmake-modules
, kdoctools
diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix
index 6080ad5db34..1a800525255 100644
--- a/pkgs/applications/kde/kaddressbook.nix
+++ b/pkgs/applications/kde/kaddressbook.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, kdepimTeam, fetchpatch,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
kcrash, kdbusaddons, ki18n, kontactinterface, kparts,
diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix
index 02ab1bd52c2..045c9a3c8d6 100644
--- a/pkgs/applications/kde/kalzium.nix
+++ b/pkgs/applications/kde/kalzium.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, qtscript, kparts, kplotting, kunitconversion }:
mkDerivation {
pname = "kalzium";
diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix
index 7251648be09..447b2d009b6 100644
--- a/pkgs/applications/kde/kapptemplate.nix
+++ b/pkgs/applications/kde/kapptemplate.nix
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
-, fetchurl
, cmake
, extra-cmake-modules
, qtbase
diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix
index 60aad7d2a95..157ca73ecfc 100644
--- a/pkgs/applications/kde/kdeconnect-kde.nix
+++ b/pkgs/applications/kde/kdeconnect-kde.nix
@@ -1,6 +1,5 @@
{ mkDerivation
, extra-cmake-modules
-, fetchpatch
, kcmutils
, kconfigwidgets
, kdbusaddons
diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix
index 5bcb9fb1100..c9a5a61e281 100644
--- a/pkgs/applications/kde/kolf.nix
+++ b/pkgs/applications/kde/kolf.nix
@@ -2,7 +2,7 @@
, mkDerivation
, extra-cmake-modules
, kdoctools
-, libkdegames, kconfig, kio, ktextwidgets
+, libkdegames, kio, ktextwidgets
}:
mkDerivation {
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index eace8660c2e..097661d5802 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -2,7 +2,6 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
- fetchpatch
}:
mkDerivation {
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix
index b14e50f32bc..6fe8c55004c 100644
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ b/pkgs/applications/kde/libkmahjongg.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib, kdepimTeam,
+ mkDerivation, lib,
extra-cmake-modules, kdoctools,
kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n,
kwidgetsaddons
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix
index d41685821cd..cdf6ca3e6f8 100644
--- a/pkgs/applications/misc/authenticator/default.nix
+++ b/pkgs/applications/misc/authenticator/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
-, fetchpatch
, appstream-glib
, clang
, desktop-file-utils
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index a6efda32d83..19a2e7aae2a 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -8,7 +8,6 @@
, libXfixes
, libXtst
, qtx11extras
-, git
, knotifications
, qtwayland
, wayland
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 76a5808963f..95d3a2aa933 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }:
+{ lib, stdenv, fetchFromGitHub, python3Packages, libspnav, jq }:
let
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index a6545db64ca..452c1edc99f 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook
+{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook
, secp256k1 }:
python3Packages.buildPythonApplication rec {
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 137682c3977..4fe60064cd5 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3
+{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3
, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index 1619f7f4334..c196a107f00 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "gpx-viewer";
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 2973ac81539..d7177906287 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gpxsee";
- version = "11.5";
+ version = "11.6";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY=";
+ hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ=";
};
patches = (substituteAll {
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 10dd5bd545c..d9e0204be32 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, pkgs
-, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive
+, glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive
, pkg-config, intltool, autoreconfHook, wrapGAppsHook
}:
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 2f6df287197..695706cefc5 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3, fetchpatch }:
+{ lib, fetchFromGitHub, python3 }:
let
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index f55752a2292..b9f78afda4b 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }:
+{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }:
buildFHSUserEnv rec {
name = "houdini-${unwrapped.version}";
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 6b594f196c9..b001b50c401 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub
+{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub
, cmake, pkg-config, zlib, libpng, makeWrapper
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix
index 54f0fe1a7d3..d1f60947539 100644
--- a/pkgs/applications/misc/k4dirstat/default.nix
+++ b/pkgs/applications/misc/k4dirstat/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation
, extra-cmake-modules
, fetchFromGitHub
-, kdoctools
, kiconthemes
, kio
, kjobwidgets
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index e64feb41655..7f13494f65f 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,7 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub
, callPackage
, pkg-config
-, makeWrapper
, qmake
, qtbase
, qtwebengine
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix
index 9d365cd328c..37f8203e047 100644
--- a/pkgs/applications/misc/kiwix/lib.nix
+++ b/pkgs/applications/misc/kiwix/lib.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, fetchFromGitHub
, meson, ninja, pkg-config
, python3
, curl
@@ -11,7 +11,6 @@
, gtest
}:
-
stdenv.mkDerivation rec {
pname = "kiwix-lib";
version = "10.1.1";
diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix
index ec978b9fc3a..b8cb75b057f 100644
--- a/pkgs/applications/misc/mupdf/1.17.nix
+++ b/pkgs/applications/misc/mupdf/1.17.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg
+{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg
, jbig2dec, libjpeg , darwin
, enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index c38ee194b4e..2ef17f9c1cd 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -12,7 +12,7 @@
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
- version = "0.15.9";
+ version = "1.0.0";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -25,7 +25,7 @@ let
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
- sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw=";
+ sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8=";
};
icon = fetchurl {
diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix
index 9f057e3b019..c463ade3986 100644
--- a/pkgs/applications/misc/osmscout-server/default.nix
+++ b/pkgs/applications/misc/osmscout-server/default.nix
@@ -14,13 +14,13 @@ let
in
mkDerivation rec {
pname = "osmscout-server";
- version = "2.1.2";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "rinigus";
repo = "osmscout-server";
rev = version;
- sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s=";
+ sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix
new file mode 100644
index 00000000000..19a9b18ce19
--- /dev/null
+++ b/pkgs/applications/misc/pattypan/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, unzip
+, jre
+, jdk
+, ant
+, makeWrapper
+, makeDesktopItem
+, copyDesktopItems
+, glib
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pattypan";
+ version = "22.03";
+
+ src = fetchFromGitHub {
+ owner = "yarl";
+ repo = "pattypan";
+ rev = "v${version}";
+ sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60";
+ };
+
+ nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ];
+ buildInputs = [ glib jre ];
+
+ buildPhase = ''
+ runHook preBuild
+ export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+ ant
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin $out/share/java
+ cp pattypan.jar $out/share/java/pattypan.jar
+ makeWrapper ${jre}/bin/java $out/bin/pattypan \
+ --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher"
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ desktopName = "Pattypan";
+ genericName = "An uploader for Wikimedia Commons";
+ categories = [ "Utility" ];
+ exec = "pattypan";
+ name = "pattypan";
+ })
+ ];
+
+ meta = with lib; {
+ homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan";
+ description = "An uploader for Wikimedia Commons";
+ license = licenses.mit;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ fee1-dead ];
+ };
+}
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 966d8207cc0..3416bb34856 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -4,7 +4,6 @@
, qmake
, mkDerivation
, qtsvg
-, libxml2
, postgresql
}:
diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix
index f27902a8aac..fc6b6a1e2d4 100644
--- a/pkgs/applications/misc/polychromatic/default.nix
+++ b/pkgs/applications/misc/polychromatic/default.nix
@@ -1,30 +1,22 @@
{ lib
, fetchFromGitHub
, bash
-, cairo
, glib
-, qt5
-, hicolor-icon-theme
, gdk-pixbuf
+, gettext
, imagemagick
-, desktop-file-utils
, ninja
, meson
, sassc
-, ibus
-, usbutils
-, libxcb
, python3Packages
, gobject-introspection
, gtk3
, wrapGAppsHook
-, libappindicator-gtk3
}:
python3Packages.buildPythonApplication rec {
name = "polychromatic";
version = "0.7.3";
-
format = "other";
src = fetchFromGitHub {
@@ -41,57 +33,40 @@ python3Packages.buildPythonApplication rec {
--replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \
--replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass'
- substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic"
+ substituteInPlace pylib/common.py \
+ --replace "/usr/share/polychromatic" "$out/share/polychromatic"
'';
preConfigure = ''
scripts/build-styles.sh
'';
- buildInputs = [
- cairo
- hicolor-icon-theme
- ];
-
- pythonPath = with python3Packages; [
- openrazer
- pyqt5
- pyqtwebengine
+ nativeBuildInputs = with python3Packages; [
+ gettext
+ gobject-introspection
+ meson
+ ninja
+ sassc
+ wrapGAppsHook
];
propagatedBuildInputs = with python3Packages; [
- libxcb
- colour
colorama
- setproctitle
- openrazer
- openrazer-daemon
- requests
- ibus
- usbutils
- pyqt5
- libappindicator-gtk3
- ];
-
- nativeBuildInputs = with python3Packages; [
- pyqt5
- desktop-file-utils
- qt5.wrapQtAppsHook
- wrapGAppsHook
- ninja
- meson
- sassc
- ];
-
- propagatedNativeBuildInputs = [
- gobject-introspection
+ colour
gtk3
- gdk-pixbuf
- imagemagick
+ openrazer
+ pygobject3
+ pyqt5
+ pyqtwebengine
+ requests
+ setproctitle
];
+ dontWrapGapps = true;
+ dontWrapQtApps = true;
+
makeWrapperArgs = [
- "\${qtWrapperArgs[@]}"
+ "\${gappsWrapperArgs[@]}"
];
meta = with lib; {
diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix
index c383baaaa9e..9af70769e3d 100644
--- a/pkgs/applications/misc/remarkable/restream/default.nix
+++ b/pkgs/applications/misc/remarkable/restream/default.nix
@@ -1,5 +1,4 @@
{ lib
-, bash
, stdenv
, lz4
, ffmpeg-full
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 273b2d6046e..ea97f8305fe 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
+{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
let
version = "2.16.5.1";
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index 0357681b749..293f214b607 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -1,8 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
-, fetchpatch
-, substituteAll
, makeWrapper
, autoreconfHook
diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/applications/misc/rofi-power-menu/default.nix
index 657796a5972..e02b7062f4b 100644
--- a/pkgs/applications/misc/rofi-power-menu/default.nix
+++ b/pkgs/applications/misc/rofi-power-menu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rofi }:
+{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "rofi-power-menu";
diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix
index a8a0bfb1e10..c924a3ec2bb 100644
--- a/pkgs/applications/misc/sl1-to-photon/default.nix
+++ b/pkgs/applications/misc/sl1-to-photon/default.nix
@@ -6,7 +6,6 @@
, numpy
, pyphotonfile
, shiboken2
-, which
}:
let
version = "0.1.3";
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 02bf65761f0..10d4ffc77b4 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
, bluez
diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix
index 95937ea5f2e..4ccddcd7007 100644
--- a/pkgs/applications/misc/termpdf.py/default.nix
+++ b/pkgs/applications/misc/termpdf.py/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
-, fetchPypi
, bibtool
, pybtex
, pymupdf
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index 63a8b485df5..491dd28435a 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = with python3Packages; [
distutils_extra
+ gobject-introspection
intltool
wrapGAppsHook
gdk-pixbuf
@@ -40,7 +41,6 @@ python3Packages.buildPythonApplication rec {
gdk-pixbuf
glib
gnome.adwaita-icon-theme
- gobject-introspection
gtk3
keybinder3
libappindicator
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 0020594bb8c..2473129bc6d 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
+{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }:
stdenv.mkDerivation rec {
pname = "wofi";
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index c5900fb9d50..1040451efae 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -1,5 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
-, donateLevel ? 0
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 13c3f217de3..3584d24f149 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, meson, ninja, fetchurl, fetchpatch
-, cairo
+{ stdenv, lib, meson, ninja, fetchurl, cairo
, girara
, gtk-mac-integration
, gumbo
diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix
index b93fcc1903b..320938eb39a 100644
--- a/pkgs/applications/networking/appgate-sdp/default.nix
+++ b/pkgs/applications/networking/appgate-sdp/default.nix
@@ -31,7 +31,6 @@
, nss
, openssl
, pango
-, procps
, python3
, stdenv
, systemd
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index d2cb55810eb..138af6cc511 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib
+{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib
, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev
, gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2
diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix
index db4940093b3..72eeda81529 100644
--- a/pkgs/applications/networking/browsers/netsurf/browser.nix
+++ b/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
+{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook
# Buildtime dependencies.
, check, pkg-config, xxd
diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix
index 422ccd05cff..413ed866196 100644
--- a/pkgs/applications/networking/cisco-packet-tracer/7.nix
+++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, buildFHSUserEnvBubblewrap
-, callPackage
, copyDesktopItems
, dpkg
, lndir
diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix
index 05ced418274..4d4f65c3066 100644
--- a/pkgs/applications/networking/cisco-packet-tracer/8.nix
+++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix
@@ -3,7 +3,6 @@
, alsa-lib
, autoPatchelfHook
, buildFHSUserEnvBubblewrap
-, callPackage
, copyDesktopItems
, dbus
, dpkg
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index 38408ed32ea..8ce7b0dcae0 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atlantis";
- version = "0.19.8";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
- sha256 = "sha256-o8lBpiR8gIo1kyOTkPOIuMnJbJsi619Zl0bAAFGYM4E=";
+ sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg=";
};
- vendorSha256 = "sha256-aEMRCvZBaY1uwZqKtMmZ4aiPdNmtANcnuE7eykBiTQg=";
+ vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix
index ef7c3787bdc..e255611a1b3 100644
--- a/pkgs/applications/networking/cluster/atmos/default.nix
+++ b/pkgs/applications/networking/cluster/atmos/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
- version = "1.8.2";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rDbnny/qRU31ciAXKLGLXS3FhgOpxmkLT4oatYCbt9g=";
+ sha256 = "sha256-/rxGAfYjV5VzYs9h8eCpz5jhmW7jPdk1XB3bXHH+oQw=";
};
- vendorSha256 = "sha256-Kfv3RlH80E/9yf/rvnY5vljaRr4cH5AhgXQn54x72Ds=";
+ vendorSha256 = "sha256-/b764auKkZF0oMqNlXmsW9aB5gcq4WFQRFjsVhNDiB4=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix
index d00b1b38b2e..da602ac6864 100644
--- a/pkgs/applications/networking/cluster/kyverno/default.nix
+++ b/pkgs/applications/networking/cluster/kyverno/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
- version = "1.7.4";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
- sha256 = "sha256-EzPd4D+pK9mFSoJx9gEWEw9izXum2NgACiBuQ6uTYGo=";
+ sha256 = "sha256-VJhn3z/utbcZdJjmVzsjyqPfpKMmDXSKUcoALSmawqs=";
};
ldflags = [
@@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
- vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk=";
+ vendorSha256 = "sha256-8Sk36IFk3tL/wqDnKJw/K1MtKBZuVRRFkyMl4b/XwDI=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];
diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix
index 5f71f8d70cb..e60c4f14e30 100644
--- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix
@@ -10,7 +10,6 @@
, mock
, netaddr
, pytestCheckHook
-, python3Packages
, radish-bdd
, semver
}:
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 331f6451516..feba95f58db 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -120,13 +120,13 @@
"version": "2.29.0"
},
"azurerm": {
- "hash": "sha256-3dJ/nXpMYEK7sB6VAnkbUfQRoCsiqXhBkU6gCYBpmHY=",
+ "hash": "sha256-MWbw0E5TtqHaoU9nxeMVrUCPlRE73KYxvC6A6tMrjC0=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
- "rev": "v3.26.0",
+ "rev": "v3.27.0",
"vendorHash": null,
- "version": "3.26.0"
+ "version": "3.27.0"
},
"azurestack": {
"hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
@@ -385,13 +385,13 @@
"version": "2.2.2"
},
"fastly": {
- "hash": "sha256-CafrOJiDkIrRph8X+EvvBkI1T7j0qUlOnyhrylToJ7s=",
+ "hash": "sha256-WxFkJBi87IvO4a/8bmftMKCc/JcfoQILCtklvr9bcuc=",
"owner": "fastly",
"provider-source-address": "registry.terraform.io/fastly/fastly",
"repo": "terraform-provider-fastly",
- "rev": "v2.3.3",
+ "rev": "v2.4.0",
"vendorHash": null,
- "version": "2.3.3"
+ "version": "2.4.0"
},
"flexibleengine": {
"hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=",
@@ -423,13 +423,13 @@
"version": "2.2.0"
},
"github": {
- "hash": "sha256-XivwHkibeaoFTeJRtTF8xqt2IwXbzcKtKwAmwCf8Ll4=",
+ "hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=",
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
- "rev": "v5.4.0",
+ "rev": "v5.5.0",
"vendorHash": null,
- "version": "5.4.0"
+ "version": "5.5.0"
},
"gitlab": {
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
@@ -615,13 +615,13 @@
"version": "0.3.0"
},
"keycloak": {
- "hash": "sha256-5IMSUSaSoe+zqwtcL6aQ7PTtLpNiWxYp/J38Zm+Hniw=",
+ "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=",
"owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
"repo": "terraform-provider-keycloak",
- "rev": "v4.0.0",
+ "rev": "v4.0.1",
"vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=",
- "version": "4.0.0"
+ "version": "4.0.1"
},
"ksyun": {
"hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index 145fae2553a..8d63a8b4c07 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgs
-, autoconf, automake, curl, iprange, iproute2, iptables, iputils
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, curl, iprange, iproute2, iptables, iputils
, kmod, nettools, procps, tcpdump, traceroute, util-linux, whois
# If true, just install FireQOS without FireHOL
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 110bcaa081a..7ce86986b70 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.33";
+ version = "3.3.35";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-dJdRGqHBPbdGrxqhOmQJSZmR+YacQCDKgu03WtrGqVA=";
+ hash = "sha256-CVWeTjigfIrCFa9OZRfA4QWZArA2vkA6psITRFMKr4o=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 00b970cd687..580af6e2e0c 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }:
+{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }:
with lib;
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 127e94ab3e5..50d68eeeba1 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, cmake
, asciidoc
, cmark
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 15e830b7687..f5d2479bdaa 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -2,7 +2,7 @@
, gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss
, nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn
, lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl
-, gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true
+, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true
}:
# FIXME: clean the mess around choosing the SSL library (nss by default)
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 8c6572224c3..325d5330d62 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -47,8 +47,8 @@ let
x86_64-darwin-version = "4.28.182";
x86_64-darwin-sha256 = "0x0zc45k0jh0hivgjymcxnnwc2lwyfq68rw39lbxp4i1ir2sbnxg";
- x86_64-linux-version = "4.28.171";
- x86_64-linux-sha256 = "sha256-rsHX/NLLGR0XZsg3Cc6GjNK6rSc9UmM2XkfjqwsJZV4=";
+ x86_64-linux-version = "4.28.184";
+ x86_64-linux-sha256 = "sha256-qAc9rHJbM7lmqNxOcOSnqnuib5zJ0Ry3hAGri8DKIlo=";
aarch64-darwin-version = "4.28.182";
aarch64-darwin-sha256 = "0bc8lhmpm0310gh1w9xkb8i1cpldchm4b4mzsr9h0mhvljxmvlyf";
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index 1d249794d44..0d320485fe7 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook
-, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify
+, xorg, gtk3, nss, alsa-lib, udev, libnotify
, wrapGAppsHook }:
let
diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix
index cc6b0d08a10..cf68308176f 100644
--- a/pkgs/applications/networking/insync/v3.nix
+++ b/pkgs/applications/networking/insync/v3.nix
@@ -3,8 +3,6 @@
, fetchurl
, makeWrapper
, dpkg
-, glibc
-, glib
, libxcb
, libGL
, nss
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 0bc25c0f859..3ab70167f7a 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages
+{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, lua, perl, python3Packages
, pciutils, dbus-glib, libcanberra-gtk2, libproxy
, enchant2, libnotify, openssl, isocodes
, desktop-file-utils
diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix
index c039febb6d7..d750937c3ee 100644
--- a/pkgs/applications/networking/mailreaders/hasmail/default.nix
+++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix
@@ -2,7 +2,6 @@
, buildGoModule
, fetchFromGitHub
, pkg-config
-, gobject-introspection
, pango
, cairo
, gtk2
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index 8572bec3432..de82535cd56 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -1,5 +1,5 @@
-{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused
-, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby
+{ coreutils, fetchFromGitHub, file, gawk, gnugrep, gnused
+, installShellFiles, lib, libiconv, makeWrapper, stdenv, ruby
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index 49905cdbd21..21b75cfe884 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -21,7 +21,7 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
-, alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
+, alsa-lib, dbus-glib, fuse, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
}:
let
diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix
index 23b2727d695..0722561cb6f 100644
--- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix
+++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix
@@ -4,7 +4,6 @@
, glib
, libX11
, gst_all_1
-, sqlite
, libepoxy
, pango
, cairo
diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix
new file mode 100644
index 00000000000..44cd2ed0051
--- /dev/null
+++ b/pkgs/applications/office/karlender/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, rustPlatform
+, fetchFromGitLab
+, pkg-config
+, gtk4
+, libadwaita
+, wrapGAppsHook4
+, glib
+, tzdata
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "karlender";
+ version = "0.6.2";
+
+ src = fetchFromGitLab {
+ owner = "loers";
+ repo = "karlender";
+ rev = "v${version}";
+ sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg=";
+ };
+
+ cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0=";
+
+ nativeBuildInputs = [
+ pkg-config
+ wrapGAppsHook4
+ glib
+ ];
+ buildInputs = [
+ gtk4
+ libadwaita
+ ];
+
+ postPatch = ''
+ substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+ '';
+
+ postInstall = ''
+ substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \
+ --replace "Exec=codes.loers.Karlender" "Exec=karlender"
+ substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \
+ --replace "codes.loers.Karlender" "karlender"
+ install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/
+ glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/
+ install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/
+ install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png
+ install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png
+ install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/
+ install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/
+ '';
+
+ meta = with lib; {
+ description = "Mobile-friendly GTK calendar application";
+ homepage = "https://gitlab.com/loers/karlender";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ chuangzhu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 3f17e46023a..6a6ddc28449 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -9,7 +9,7 @@
, sqlcipher
# Needed for running tests:
-, qtbase, xvfb-run
+, xvfb-run
, python3
}:
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index f5ad715d87a..d070d98d3f5 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchpatch, fetchurl,
+{ mkDerivation, lib, fetchurl,
cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee,
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive,
diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix
index 35f7b60a45a..302dc1c7bfb 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
-, fetchurl
, cmake
, corrosion
, extra-cmake-modules
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index ffd608edf7f..46303d9c92a 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd
+{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd
, hamlib, perl, python3, udev }:
with lib;
diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix
index 080011e167e..248561b3ee1 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/applications/radio/klog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
+{ lib, stdenv, fetchurl, hamlib, pkg-config, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "klog";
diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix
index f758e411679..7922438df52 100644
--- a/pkgs/applications/science/biology/delly/default.nix
+++ b/pkgs/applications/science/biology/delly/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }:
+{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }:
stdenv.mkDerivation rec {
pname = "delly";
diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/applications/science/biology/meme-suite/default.nix
index bfa561437e7..c0f67c31416 100644
--- a/pkgs/applications/science/biology/meme-suite/default.nix
+++ b/pkgs/applications/science/biology/meme-suite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python3, perl, glibc, zlib }:
+{ lib, stdenv, fetchurl, python3, perl, zlib }:
stdenv.mkDerivation rec {
pname = "meme-suite";
diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix
index 11530c6a722..6884e1955f7 100644
--- a/pkgs/applications/science/biology/sortmerna/default.nix
+++ b/pkgs/applications/science/biology/sortmerna/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }:
+{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }:
stdenv.mkDerivation rec {
pname = "sortmerna";
diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix
index 7aafa70f7fa..9645e5426ab 100644
--- a/pkgs/applications/science/electronics/appcsxcad/default.nix
+++ b/pkgs/applications/science/electronics/appcsxcad/default.nix
@@ -7,7 +7,6 @@
, hdf5
, vtkWithQt5
, qtbase
-, wrapQtAppsHook
, fparser
, tinyxml
, cgal
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 10dcb2327c0..57104cb045e 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.111";
+ version = "3.3.113";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
- sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl";
+ sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix
index e7b947450ac..083f01a4288 100644
--- a/pkgs/applications/science/electronics/openems/default.nix
+++ b/pkgs/applications/science/electronics/openems/default.nix
@@ -10,7 +10,6 @@
, zlib
, cmake
, octave
-, gl2ps
, mpi
, withQcsxcad ? true
, withMPI ? false
diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix
index 07c3b62d37d..4750dd08c0a 100644
--- a/pkgs/applications/science/logic/cbmc/default.nix
+++ b/pkgs/applications/science/logic/cbmc/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "cbmc";
- version = "5.67.0";
+ version = "5.68.0";
src = fetchFromGitHub {
owner = "diffblue";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA=";
+ sha256 = "sha256-Hup/E426sPAj8/vpgBz8j6C65fG6U59oq78mqmGkDD8=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix
index dc1094f3e27..343b50dfd7e 100644
--- a/pkgs/applications/science/logic/mcy/default.nix
+++ b/pkgs/applications/science/logic/mcy/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, yosys, symbiyosys, python3
+, yosys, python3
}:
let
diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix
index e28137dde75..62d259f8318 100644
--- a/pkgs/applications/science/logic/petrinizer/default.nix
+++ b/pkgs/applications/science/logic/petrinizer/default.nix
@@ -1,7 +1,6 @@
{ mkDerivation
, async, base, bytestring, containers, fetchFromGitLab, mtl
-, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3
-}:
+, parallel-io, parsec, lib, stm, transformers, sbv_7_13}:
mkDerivation rec {
pname = "petrinizer";
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 11cd1918896..160d67094f4 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, fetchpatch, lib, stdenv
+{ callPackage, fetchurl, lib, stdenv
, ocamlPackages, coqPackages, rubber, hevea, emacs }:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix
index 54aa2251174..95d5b95718d 100644
--- a/pkgs/applications/science/logic/why3/with-provers.nix
+++ b/pkgs/applications/science/logic/why3/with-provers.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, runCommand, symlinkJoin, why3 }:
+{ stdenv, makeWrapper, runCommand, why3 }:
provers:
let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
''
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index da66dc241d2..927a71b9ef1 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, pkg-config
-, fetchpatch
, python3
, meson
, ninja
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 4fd18969a94..6cdb7919d9e 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -1,7 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
-, runtimeShell
}:
# This file is responsible for fetching the sage source and adding necessary patches.
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index ed9e64347a8..eea34fb7788 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitLab
-, fetchpatch
, autoreconfHook
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
index a89b73eb866..6821e33d1a6 100644
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
@@ -2,9 +2,6 @@
, stdenv
, fetchgit
, bash
-, pkg-config
-, jre8
-, libuuid
, openmodelica
, mkOpenModelicaDerivation
}:
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index b65c2352139..34509f05daa 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake
+{ lib, mkDerivation, fetchFromGitHub, qmake
, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2
, alsa-lib, libsndfile, flite, openssl, udev, SDL2
}:
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index 4aee366e987..712374ef752 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "MAVProxy";
- version = "1.8.56";
+ version = "1.8.57";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-wyY9oYWABkXNhlZW4RFuyZy/HEnv7cGFVbXVoEnIF1Q=";
+ sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4=";
};
postPatch = ''
diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix
index 17af8457cb1..80d3d6187d1 100644
--- a/pkgs/applications/terminal-emulators/darktile/default.nix
+++ b/pkgs/applications/terminal-emulators/darktile/default.nix
@@ -1,5 +1,4 @@
{ stdenv
-, buildGoModule
, fetchFromGitHub
, lib
, go
diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix
index 917b179490c..736b0e36d95 100644
--- a/pkgs/applications/terminal-emulators/tilix/default.nix
+++ b/pkgs/applications/terminal-emulators/tilix/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, meson
, ninja
, python3
@@ -13,7 +12,6 @@
, gettext
, gtkd
, libsecret
-, glib
, wrapGAppsHook
, libunwind
, appstream
diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix
index 7bc4941caf1..7ce5d95775c 100644
--- a/pkgs/applications/terminal-emulators/x3270/default.nix
+++ b/pkgs/applications/terminal-emulators/x3270/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, m4, expat
+{ lib, stdenv, fetchurl, m4, expat
, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir
, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi
, fontbhlucidatypewriter100dpi, fontbitstream100dpi
diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix
index bed85a37f54..fab2780d964 100644
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/pkgs/applications/version-management/bcompare/default.nix
@@ -1,4 +1,4 @@
-{ lib, autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice
+{ lib, autoPatchelfHook, bzip2, cairo, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice
, stdenv, runtimeShell, unzip
}:
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 7a26b38b6b2..5bdab4b081e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -1,29 +1,27 @@
{ lib
, stdenv
-, fetchFromGitea
+, fetchFromGitHub
, rustPlatform
-, libiconv
, Security
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "git-gone";
- version = "0.4.1";
+ version = "0.4.2";
- src = fetchFromGitea {
- domain = "codeberg.org";
- owner = "flausch";
- repo = pname;
+ src = fetchFromGitHub {
+ owner = "lunaryorn";
+ repo = "git-gone";
rev = "v${version}";
- sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o=";
+ sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no=";
};
- cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw=";
+ cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE=";
nativeBuildInputs = [ installShellFiles ];
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
installManPage git-gone.1
@@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Cleanup stale Git branches of merge requests";
- homepage = "https://codeberg.org/flausch/git-gone";
- changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md";
+ homepage = "https://github.com/lunaryorn/git-gone";
+ changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
index b85f6d973cf..97e2cf0537a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-interactive-rebase-tool";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "MitMaro";
repo = pname;
rev = version;
- sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0=";
+ sha256 = "sha256-KqItunxh24jAkvsAMnByS+dhm+wyUqmdF96qEDs/5mI=";
};
- cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA=";
+ cargoSha256 = "sha256-510kNtcSsuXADMmSqu2t0HsnPUS/Jedsfvjnh2k+vDs=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index b5c251f247a..9dc5143790a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.12.0";
+ version = "3.12.4";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-o4OVA9cv+/JLiTUnDEAI/yj+YmOulFrX5XmlRZAb2vw=";
+ sha256 = "sha256-HRf6e6Qs1zghU01JmZQsR9CHyslUD1T+pCY8eq1JTmo=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix
new file mode 100644
index 00000000000..0f0eeff156b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, python, perl, fetchFromGitHub, installShellFiles }:
+stdenv.mkDerivation rec {
+ pname = "git-publish";
+ version = "1.8.1";
+
+ src = fetchFromGitHub {
+ owner = "stefanha";
+ repo = "git-publish";
+ rev = "v${version}";
+ sha256 = "14rz5kli6sz171cvdc46z3z0nnpd57rliwr6nn6vjjc49yyfwgl4";
+ };
+
+ nativeBuildInputs = [ perl installShellFiles ];
+ buildInputs = [ python ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm0755 git-publish $out/bin/git-publish
+ pod2man git-publish.pod > git-publish.1
+ installManPage git-publish.1
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Prepare and store patch revisions as git tags";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.lheckemann ];
+ homepage = "https://github.com/stefanha/git-publish";
+ };
+}
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index 06a2bb48989..0a366827e40 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages, git }:
+{ lib, pythonPackages, git }:
pythonPackages.buildPythonApplication rec {
pname = "git-up";
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a5c6dc8c274..feb1063503f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles
+{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles
, re2Support ? true
, rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform
, fullBuild ? false
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 6f62a381a50..866146e1d8f 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn
+{ lib, stdenv, fetchFromGitHub, boost, zlib, botan2, libidn
, lua, pcre, sqlite, perl, pkg-config, expect, less
, bzip2, gmp, openssl
, autoreconfHook, texinfo
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index fc57024ea20..2c7836f1318 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git
-, asciidoctor, ruby
+{ lib, fetchurl, buildGoModule, asciidoctor, ruby
}:
buildGoModule rec {
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index aee65dee3bb..d5c8a97a5f8 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -1,5 +1,4 @@
{ python3
-, openssl
, callPackage
, recurseIntoAttrs
, nixosTests
diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix
new file mode 100644
index 00000000000..8e32b42912c
--- /dev/null
+++ b/pkgs/applications/version-management/srvc/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "srvc";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "insilica";
+ repo = "rs-srvc";
+ rev = "v${version}";
+ sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I=";
+ };
+
+ cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg=";
+
+ meta = with lib; {
+ description = "Sysrev version control";
+ homepage = "https://github.com/insilica/rs-srvc";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ john-shaffer ];
+ };
+}
diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix
index e873ac4a3bc..0d063e70718 100644
--- a/pkgs/applications/video/haruna/default.nix
+++ b/pkgs/applications/video/haruna/default.nix
@@ -26,13 +26,13 @@
mkDerivation rec {
pname = "haruna";
- version = "0.9.1";
+ version = "0.9.3";
src = fetchFromGitLab {
owner = "multimedia";
repo = "haruna";
rev = "v${version}";
- hash = "sha256-pkskrzpKDsMg7DOC335zXknEIKh9Ku2NgyeinawQtiY=";
+ hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg=";
domain = "invent.kde.org";
};
diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix
index b8bbe3ae46f..a7dc758696c 100644
--- a/pkgs/applications/video/kodi/addons/iagl/default.nix
+++ b/pkgs/applications/video/kodi/addons/iagl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }:
+{ lib, buildKodiAddon, fetchFromGitHub, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }:
buildKodiAddon rec {
pname = "iagl";
diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix
index d7b45485d68..aaaed78d414 100644
--- a/pkgs/applications/video/kodi/addons/keymap/default.nix
+++ b/pkgs/applications/video/kodi/addons/keymap/default.nix
@@ -1,4 +1,4 @@
-{ lib, addonDir, buildKodiAddon, fetchzip, defusedxml, kodi-six }:
+{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }:
buildKodiAddon rec {
pname = "keymap";
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 4ad3a6603de..9cce7bb3b33 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -3,7 +3,6 @@
, fetchFromGitLab
, pkg-config
, autoreconfHook
-, qmake
, rake
, boost
, cmark
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index d4f75e7d930..01a2d973bf3 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -2,7 +2,6 @@
, lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, addOpenGLRunpath
, docutils
, perl
diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
index 1dbfef2a864..1696a2d9493 100644
--- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
+++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio
+{ lib, stdenv, cmake, libbfd, SDL2, obs-studio
, looking-glass-client }:
stdenv.mkDerivation {
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index b1f3e680ef2..80bcb6d41b9 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -1,8 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
-, fetchurl
, cmake
, obs-studio
}:
diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix
index f4d915374b8..620cedb6c1b 100644
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@@ -6,7 +6,6 @@
, wrapGAppsHook
, withGtk3 ? false
, ffmpeg
-, gtk3
, wget
, xdg-utils
, youtube-dl
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index acd0bb496b5..e268b05094e 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
-, fetchpatch
, mkDerivation
, SDL2
, frei0r
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index ec078f55aa5..5ea14cae033 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -6,7 +6,6 @@
, pkg-config
, which
, libapparmor
-, apparmor-parser
, libseccomp
, libselinux
, makeWrapper
diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
index bddaab61578..3472c760428 100644
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -4,7 +4,6 @@
, libnotify
, gobject-introspection
, python3Packages
-, wrapGAppsHook
, extraLibs ? [] }:
python3Packages.buildPythonApplication rec {
diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix
index 499713f966a..40ac908fe58 100644
--- a/pkgs/applications/window-managers/sway/contrib.nix
+++ b/pkgs/applications/window-managers/sway/contrib.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
-, fetchurl
, coreutils
, makeWrapper
, sway-unwrapped
diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix
index 8fa6a84b721..50fbae605da 100644
--- a/pkgs/applications/window-managers/tinywm/default.nix
+++ b/pkgs/applications/window-managers/tinywm/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
dontConfigure = true;
buildPhase = ''
- ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm
+ $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm
'';
installPhase = ''
diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix
index bd9bcb30d10..51111932cd2 100644
--- a/pkgs/applications/window-managers/wayfire/wf-shell.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
-, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix
index b276e6fc49e..60d0493dd75 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 = "202210060105";
+ version = "202210130107";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
- rev = "0bb2420d643555aa19b21f3c06b517a7c14826b6";
- sha256 = "sha256-5vr7iO2vny9yalJblBVgNwupEQ9w3LZXM+VKb4xSVD0=";
+ rev = "becf974734e41542c356a0c0ae21a619c476d500";
+ sha256 = "sha256-IF7mcyiZc4CTFWSflxQBH8Z9NloCcsCymOhU85GaoEg=";
};
installPhase = ''
diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix
index bac99fd79ac..601f05a51bb 100644
--- a/pkgs/development/compilers/scala/2.x.nix
+++ b/pkgs/development/compilers/scala/2.x.nix
@@ -26,8 +26,8 @@ let
};
"2.13" = {
- version = "2.13.8";
- sha256 = "LLMdhGnGUYOfDpyDehqwZVDQMXJnUvVJBr4bneATFM8=";
+ version = "2.13.10";
+ sha256 = "sha256-sBRhWZzQeGBCxktTN5D0XlG6u5HFLcRl2EaDjpcBnMQ=";
pname = "scala_2_13";
};
};
diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix
index cba2e595cf7..6ed31064936 100644
--- a/pkgs/development/embedded/arduino/arduino-language-server/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "arduino-language-server";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "arduino";
repo = "arduino-language-server";
rev = version;
- hash = "sha256-FnkXtjktj22LCkmFPxzQ72qiVBC1WR/ZiwMsmZPL578=";
+ hash = "sha256-7xuVCD27gE8uDFBTQgBwH8bx8OWc9Lj71o27FYOSiTY=";
};
subPackages = [ "." ];
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ade4168036a..3914d09e9d0 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -167,10 +167,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
- patch = "14";
+ patch = "15";
suffix = "";
};
- sha256 = "sha256-QVeuMeuBrxnoHDaIJhBJGw+49Q4A+ooXsJXIiQi5xFw=";
+ sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -180,10 +180,10 @@ in {
sourceVersion = {
major = "3";
minor = "8";
- patch = "14";
+ patch = "15";
suffix = "";
};
- sha256 = "sha256-XXfieCcbqAPpkJpBpPO6ygBhgck62mgqXl/o3EokxfM=";
+ sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA=";
inherit (darwin) configd;
inherit passthruFun;
};
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 68cb1dd3e33..954628986e4 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -3,6 +3,8 @@
, fetchRepoProject
, writeScript
, cmake
+, directx-shader-compiler
+, glslang
, ninja
, patchelf
, perl
@@ -22,13 +24,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2022.Q3.3";
+ version = "2022.Q3.5";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "jbx6R6tDaVWD5jLVW2IiNaw+VwFkQ9EG2FvpAj/bfZ4=";
+ sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs=";
};
buildInputs = [
@@ -49,6 +51,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
+ directx-shader-compiler
+ glslang
ninja
patchelf
perl
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 5f67eda61a2..5af49f23c44 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "11.4.0";
+ version = "11.4.1";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "sha256-AWUxFSwCcppgKqbxb0ujsEdXQNXBvSjTTt1yZPR2Rhw=";
+ sha256 = "sha256-2ttf01vE3CUbNvXdgHKcPFiNZeLsvNTk41mtnLBFI/s=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/development/libraries/boost-ext/boost-sml/default.nix
new file mode 100644
index 00000000000..fd69db12d3c
--- /dev/null
+++ b/pkgs/development/libraries/boost-ext/boost-sml/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, cmake
+, fetchFromGitHub
+, boost
+}:
+
+stdenv.mkDerivation rec {
+ pname = "boost-sml";
+ # This is first commit since 1.1.6 that passes all tests (test_policies_logging is commented out)
+ version = "1.1.6";
+ working_tests = "24d762d1901f4f6afaa5c5e0d1b7b77537964694";
+
+ src = fetchFromGitHub {
+ owner = "boost-ext";
+ repo = "sml";
+ rev = "${working_tests}";
+ hash = "sha256-ZhIfyYdzrzPTAYevOz5I6tAcUiLRMV8HENKX9jychEY=";
+ };
+
+ buildInputs = [ boost ];
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DSML_BUILD_BENCHMARKS=OFF"
+ "-DSML_BUILD_EXAMPLES=OFF"
+ "-DSML_BUILD_TESTS=ON"
+ "-DSML_USE_EXCEPTIONS=ON"
+ ];
+
+ doCheck = true;
+
+ meta = with lib; {
+ description = "Header only state machine library with no dependencies";
+ homepage = "https://github.com/boost-ext/sml";
+ license = licenses.boost;
+ maintainers = with maintainers; [ prtzl ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 039a5cb4161..8e4cf0ac936 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "22.2.0";
+ version = "22.2.1";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
- sha256 = "sha256-Wy2OroZI4bo+3OdKaa0e5N+QNKKgWVOJrK1Cdda8yDI=";
+ sha256 = "sha256-/v2RUn/s3wrBdfClXkm6MM9KfSEWjbE2Njs3fDqXaj8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 1b461ee9e1c..925cd2eeb8f 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
- version = "22.5.2";
+ version = "22.5.3.1";
outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
- sha256 = "sha256-3WqmTM68XdQfGibkVAT1S9N7Cn8eviNM6qUeF8qogtc=";
+ sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek=";
};
patches = [
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 7225efad2f6..3554457d3f2 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
- version = "0.0.6";
+ version = "0.0.7";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4=";
+ sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index b13aa66eb8f..30ddc3d3b62 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
homepage = "https://oracle.github.io/odpi/";
maintainers = with maintainers; [ mkazulak flokli ];
license = licenses.asl20;
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
hydraPlatforms = [];
};
}
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index f5a414786ac..129874c1dfb 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -22,18 +22,32 @@ let
# determine the version number, there might be different ones per architecture
version = {
- x86_64-linux = "19.3.0.0.0";
+ x86_64-linux = "19.16.0.0.0";
+ aarch64-linux = "19.10.0.0.0";
x86_64-darwin = "19.3.0.0.0";
}.${stdenv.hostPlatform.system} or throwSystem;
+ directory = {
+ x86_64-linux = "1916000";
+ aarch64-linux = "191000";
+ x86_64-darwin = "193000";
+ }.${stdenv.hostPlatform.system} or throwSystem;
+
# hashes per component and architecture
hashes = {
x86_64-linux = {
- basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
- sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
- sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5";
- tools = "1q19blr0gz1c8bq0bnv1njzflrp03hf82ngid966xc6gwmqpkdsk";
- odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
+ basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ=";
+ sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI=";
+ sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw=";
+ tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE=";
+ odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA=";
+ };
+ aarch64-linux = {
+ basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY=";
+ sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw=";
+ sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q=";
+ tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M=";
+ odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms=";
};
x86_64-darwin = {
basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd";
@@ -50,11 +64,13 @@ let
# convert platform to oracle architecture names
arch = {
x86_64-linux = "linux.x64";
+ aarch64-linux = "linux.arm64";
x86_64-darwin = "macos.x64";
}.${stdenv.hostPlatform.system} or throwSystem;
shortArch = {
x86_64-linux = "linux";
+ aarch64-linux = "linux";
x86_64-darwin = "mac";
}.${stdenv.hostPlatform.system} or throwSystem;
@@ -62,12 +78,11 @@ let
srcFilename = component: arch: version: rel:
"instantclient-${component}-${arch}-${version}" +
(optionalString (rel != "") "-${rel}") +
- (optionalString (arch == "linux.x64" || arch == "macos.x64") "dbru") + # ¯\_(ツ)_/¯
- ".zip";
+ "dbru.zip"; # ¯\_(ツ)_/¯
# fetcher for the non clickthrough artifacts
fetcher = srcFilename: hash: fetchurl {
- url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/193000/${srcFilename}";
+ url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}";
sha256 = hash;
};
@@ -127,7 +142,7 @@ stdenv.mkDerivation {
'';
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ flokli ];
hydraPlatforms = [ ];
};
diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix
index 354c68decfb..7e903a3d6b8 100644
--- a/pkgs/development/libraries/pdal/default.nix
+++ b/pkgs/development/libraries/pdal/default.nix
@@ -8,6 +8,7 @@
, gdal
, hdf5-cpp
, LASzip
+, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format
, libe57format
, libgeotiff
, libxml2
@@ -40,7 +41,6 @@ stdenv.mkDerivation rec {
gdal
hdf5-cpp
LASzip
- libe57format
libgeotiff
libxml2
postgresql
@@ -48,10 +48,12 @@ stdenv.mkDerivation rec {
xercesc
zlib
zstd
+ ] ++ lib.optionals enableE57 [
+ libe57format
];
cmakeFlags = [
- "-DBUILD_PLUGIN_E57=ON"
+ "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}"
"-DBUILD_PLUGIN_HDF=ON"
"-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
"-DBUILD_PLUGIN_TILEDB=ON"
diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix
index 6f648463c85..a3b85e36796 100644
--- a/pkgs/development/libraries/physics/clhep/default.nix
+++ b/pkgs/development/libraries/physics/clhep/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "clhep";
- version = "2.4.5.3";
+ version = "2.4.6.0";
src = fetchurl {
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
- hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM=";
+ hash = "sha256-6NFt67hM7SjkDproR4nPWgra1F+SE/usPOdYPgbKp7E=";
};
prePatch = ''
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 1da9b869a0d..c915a3df521 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
- version = "7.7.2";
+ version = "7.7.3";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Cla2yat/xCrzx53mYRKjcvH9cCY0MVD8RSMjGfxVDUM=";
+ sha256 = "sha256-Np3HPTZYzyoPOKL0xgsLzcvOkceFiEQd+1nyGbg4BHo=";
};
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 6ec3acebd6e..8fa3c086224 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
})
+ # error: implicit declaration of function 'cfmakeraw' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/vte/-/commit/1f1f177ff797ac2bb453168951135865cfded900.patch";
+ sha256 = "sha256-VRVhq8JAshtcFejJkNUpMilo7tLgcojlEnCTrAtGVa0=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
index 34989fdf14d..1a56ed70401 100644
--- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
@@ -1,19 +1,19 @@
-{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page, logs
+{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, logs
, mirage-block, ounit2, rresult, uri }:
buildDunePackage rec {
pname = "mirage-block-unix";
- version = "2.14.1";
+ version = "2.14.2";
src = fetchurl {
url =
"https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-${version}.tbz";
- sha256 = "sha256-FcUhbjHKT11ePDXaAVzUdV/WOHoxMoXyZKG5ikKpBNU=";
+ sha256 = "sha256-6ReAzd+pCd5ccmXOh6GlSxHo4GuEgptxLha62n+dBsE=";
};
- minimalOCamlVersion = "4.06";
+ minimalOCamlVersion = "4.08";
- propagatedBuildInputs = [ cstruct-lwt io-page logs mirage-block rresult uri ];
+ propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ];
doCheck = true;
checkInputs = [ diet ounit2 ];
diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix
index ae1339ca274..b879b9f313a 100644
--- a/pkgs/development/octave-modules/signal/default.nix
+++ b/pkgs/development/octave-modules/signal/default.nix
@@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "signal";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
- sha256 = "1amfh7ifjqxz2kr34hgq2mq8ygmd5j3cjdk1k2dk6qcgic7n0y6r";
+ sha256 = "YqTgYRfcxDw2FpkF+CVdAVSBypgq6ukBOw2d8+SOcGI=";
};
requiredOctavePackages = [
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index 8f0ef50e7fd..df7575de048 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aioftp";
- version = "0.21.3";
+ version = "0.21.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I=";
+ sha256 = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index bb517f7ff8c..7f09c490cb9 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -9,7 +9,7 @@
}:
buildPythonPackage rec {
- version = "21.0.1";
+ version = "22.0.0";
pname = "azure-mgmt-network";
format = "setuptools";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
- hash = "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=";
+ hash = "sha256-qXWmZuiYA6BwFP/uydPi8mV68WlXrJlwP9eiTk+q1Ak=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 8bef6cf2148..c2f3c1f7915 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -1,21 +1,38 @@
{ lib
, buildPythonPackage
-, python, runCommand
+, python
+, runCommand
, fetchFromGitHub
-, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
-, dialog, gnureadline
-, pytest-xdist, pytestCheckHook, python-dateutil
+, configargparse
+, acme
+, configobj
+, cryptography
+, distro
+, josepy
+, parsedatetime
+, pyRFC3339
+, pyopenssl
+, pytz
+, requests
+, six
+, zope_component
+, zope_interface
+, dialog
+, gnureadline
+, pytest-xdist
+, pytestCheckHook
+, python-dateutil
}:
buildPythonPackage rec {
pname = "certbot";
- version = "1.29.0";
+ version = "1.31.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-DFdXDFSqqkm4r59Kmd1wxcg2YePP3dI9squiW+iSmaU=";
+ sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg=";
};
sourceRoot = "source/${pname}";
@@ -59,15 +76,17 @@ buildPythonPackage rec {
# certbot.withPlugins has a similar calling convention as python*.withPackages
# it gets invoked with a lambda, and invokes that lambda with the python package set matching certbot's:
# certbot.withPlugins (cp: [ cp.certbot-dns-foo ])
- passthru.withPlugins = f: let
- pythonEnv = python.withPackages f;
+ passthru.withPlugins = f:
+ let
+ pythonEnv = python.withPackages f;
- in runCommand "certbot-with-plugins" {
- } ''
- mkdir -p $out/bin
- cd $out/bin
- ln -s ${pythonEnv}/bin/certbot
- '';
+ in
+ runCommand "certbot-with-plugins"
+ { } ''
+ mkdir -p $out/bin
+ cd $out/bin
+ ln -s ${pythonEnv}/bin/certbot
+ '';
meta = with lib; {
homepage = src.meta.homepage;
diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix
index 5806104d419..3838c494cc8 100644
--- a/pkgs/development/python-modules/iaqualink/default.nix
+++ b/pkgs/development/python-modules/iaqualink/default.nix
@@ -1,31 +1,52 @@
{ lib
-, aiohttp
, buildPythonPackage
, fetchFromGitHub
-, pytest-runner
+, hatch-vcs
+, hatchling
+, httpx
, pytestCheckHook
, pythonOlder
+, respx
}:
buildPythonPackage rec {
pname = "iaqualink";
- version = "0.4.1";
+ version = "0.5.0";
+ format = "pyproject";
+
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "flz";
repo = "iaqualink-py";
rev = "v${version}";
- sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq";
+ hash = "sha256-ewPP2Xq+ecZGc5kokvLEsRokGqTWlymrzkwk480tapk=";
};
- nativeBuildInputs = [ pytest-runner ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
- propagatedBuildInputs = [ aiohttp ];
+ nativeBuildInputs = [
+ hatch-vcs
+ hatchling
+ ];
- checkInputs = [ pytestCheckHook ];
+ propagatedBuildInputs = [
+ httpx
+ ] ++ httpx.optional-dependencies.http2;
- pythonImportsCheck = [ "iaqualink" ];
+ checkInputs = [
+ pytestCheckHook
+ respx
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "pytest --cov-config=pyproject.toml --cov-report=xml --cov-report=term --cov=src --cov=tests" ""
+ '';
+
+ pythonImportsCheck = [
+ "iaqualink"
+ ];
meta = with lib; {
description = "Python library for Jandy iAqualink";
diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix
index 4e8d96c3301..a49426bb644 100644
--- a/pkgs/development/python-modules/meteofrance-api/default.nix
+++ b/pkgs/development/python-modules/meteofrance-api/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, poetry-core
, pytestCheckHook
, pythonOlder
@@ -14,26 +13,18 @@
buildPythonPackage rec {
pname = "meteofrance-api";
- version = "1.0.2";
+ version = "1.1.0";
format = "pyproject";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "hacf-fr";
repo = pname;
rev = "v${version}";
- hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU=";
+ hash = "sha256-1ZN/9ur6uhK7M5TurmmWgUjzkc79MPqKnT637hbAAWA=";
};
- patches = [
- (fetchpatch {
- # Switch to poetry-core
- url = "https://github.com/hacf-fr/meteofrance-api/commit/7536993fe38dfe3d0833da3fd750be9277aeffa6.patch";
- hash = "sha256-/4VgzoJxhaXoj1N1GNLJNvkQvv6IW9OcBJV6vg6kthM=";
- })
- ];
-
nativeBuildInputs = [
poetry-core
];
@@ -41,9 +32,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pytz
requests
- urllib3
- ] ++ lib.optionals (pythonOlder "3.7") [
typing-extensions
+ urllib3
];
checkInputs = [
@@ -51,12 +41,6 @@ buildPythonPackage rec {
requests-mock
];
- postPatch = ''
- # https://github.com/hacf-fr/meteofrance-api/pull/378
- substituteInPlace pyproject.toml \
- --replace 'pytz = ">=2020.4,<2022.0"' 'pytz = ">=2020.4,<2023.0"'
- '';
-
pythonImportsCheck = [
"meteofrance_api"
];
diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 069cda129d1..c65ef0c35c2 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -1,5 +1,6 @@
{ lib
, stdenv
+, aiohttp
, buildPythonPackage
, ed25519
, fetchFromGitHub
@@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "nats-py";
- version = "2.1.7";
+ version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,10 +21,11 @@ buildPythonPackage rec {
owner = "nats-io";
repo = "nats.py";
rev = "refs/tags/v${version}";
- hash = "sha256-K2ugTwfeYrdBnXFV9SHNQP+fNvUmc1yuy53gpGmmvS0=";
+ hash = "sha256-w+YySX9RNXUttt7iLg/Efh8bNzmhIQTKMXcoPO1k4lI=";
};
propagatedBuildInputs = [
+ aiohttp
ed25519
];
diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index 8aaa833d2f0..18c70e47b21 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "nexia";
- version = "2.0.2";
+ version = "2.0.4";
format = "setuptools";
disabled = pythonOlder "3.5";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bdraco";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-JbWKNM7fNhIuBnIHAvRegAxmE0OOwsTDQWaMtuDVQcc=";
+ sha256 = "sha256-Pxr69NwdUY1FqIrJu60+KApHRBJ3WwAMifjweJuA8lI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index fb0536e6238..5401e07916a 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.25.0";
+ version = "0.25.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
- sha256 = "sha256-5kgUSEwrSDdVmPTnWXHGPefDWIWP8AQFBQ+CbKed+Co=";
+ sha256 = "sha256-7LwQwtzNLB9dvV79CFBNdC5I8uw+BP+H108ljacQjgY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix
index 4e56bb49f5f..094711199a7 100644
--- a/pkgs/development/python-modules/pyro5/default.nix
+++ b/pkgs/development/python-modules/pyro5/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "Pyro5";
- version = "5.13.1";
+ version = "5.14";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "2be9da379ae0ec4cf69ffb3c5c589b698eea00e614a9af7945b87fa9bb09baf2";
+ sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo=";
};
propagatedBuildInputs = [ serpent ];
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index 0547f3edd93..d9785592900 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pywbem";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4=";
+ sha256 = "sha256-xffkWMJTDGE1j7xjM750+vNmqs546uM3QUMSZ63zJhA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index f75e5cc19ee..258cd012716 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -7,41 +7,56 @@
, freezegun
, humanize
, lark
+, lxml
, parse-type
, pysingleton
+, pytest-mock
, pytestCheckHook
+, pythonOlder
, pyyaml
, tag-expressions
-, lxml
-, pytest-mock
}:
buildPythonPackage rec {
pname = "radish-bdd";
- version = "0.13.4";
+ version = "0.14.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
- # Pypi package does not have necessary test fixtures.
src = fetchFromGitHub {
owner = pname;
repo = "radish";
- rev = "v${version}";
- sha256 = "1slfgh61648i009qj8156qipy21a6zm8qzjk00kbm5kk5z9jfryi";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI=";
};
propagatedBuildInputs = [
- lark
click
colorful
- tag-expressions
- parse-type
- humanize
- pyyaml
docopt
+ humanize
+ lark
+ lxml
+ parse-type
pysingleton
+ tag-expressions
];
- checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ];
- disabledTests = [ "test_main_cli_calls" ];
+ checkInputs = [
+ freezegun
+ pytest-mock
+ pytestCheckHook
+ pyyaml
+ ];
+
+ pythonImportsCheck = [
+ "radish"
+ ];
+
+ disabledTests = [
+ "test_main_cli_calls"
+ ];
meta = with lib; {
description = "Behaviour-Driven-Development tool for python";
diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix
index f7c5eae72a8..3eb953bd480 100644
--- a/pkgs/development/tools/analysis/rizin/cutter.nix
+++ b/pkgs/development/tools/analysis/rizin/cutter.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "cutter";
- version = "2.1.0";
+ version = "2.1.2";
src = fetchFromGitHub {
owner = "rizinorg";
repo = "cutter";
rev = "v${version}";
- sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs=";
+ sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json
index cb9d5be3562..e3df6799330 100644
--- a/pkgs/development/tools/build-managers/scala-cli/sources.json
+++ b/pkgs/development/tools/build-managers/scala-cli/sources.json
@@ -1,17 +1,17 @@
{
- "version": "0.1.15",
+ "version": "0.1.16",
"assets": {
"aarch64-darwin": {
"asset": "scala-cli-aarch64-apple-darwin.gz",
- "sha256": "17zc0fd83r8wsj9bf448f1y0s5plp3xdkqh2qbfsqak4jk4f22jn"
+ "sha256": "1ryjsf126dsqkpnkc2dmr3p373sb518q2ply0y1ifrx3rhqj0viq"
},
"x86_64-darwin": {
"asset": "scala-cli-x86_64-apple-darwin.gz",
- "sha256": "1c3znwad91czfvym82g4hbh96ny8wnhjcqshj6zchvzdh8c1xiqm"
+ "sha256": "1vfx9ccl08mykr579nq9kwbv88d6gaq1vd9xscwyq5rps6lxrz92"
},
"x86_64-linux": {
"asset": "scala-cli-x86_64-pc-linux.gz",
- "sha256": "0s193bkh1b431hbdfa9fnw3id6p57byy8n10v3s15sk5yi96jl87"
+ "sha256": "1p2lk2hkj149r27p4kwxvwlvjvzv9l0zncqfs3wa972jyn4hhr9g"
}
}
}
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 3229f228716..211191c8f37 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -3,13 +3,13 @@
nixosTests }:
buildGoModule rec {
pname = "buildkite-agent";
- version = "3.39.0";
+ version = "3.39.1";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "sha256-wEi14Iax155S2tr+Qxa3figXPDKKIdFcwDYv/nsLScQ=";
+ sha256 = "sha256-sUBH0Oz1yeOgY5pmzM8XLoQ9vPiPODC6zeOO2n3meXs=";
};
vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE=";
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 7dd67dcebd3..c0211bd17fe 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
- version = "7.8.2";
+ version = "7.8.3";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k=";
+ sha256 = "sha256-7r9/r6gj8u3r4R5UQIxpnmJ33SGfEAuOcqRLK11khfc=";
};
- vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg=";
+ vendorSha256 = "sha256-tEh1D/eczqLzuVQUcHE4+7Q74jM/yomdPDt6+TVJeew=";
subPackages = [ "fly" ];
diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix
index ca9219a0441..3bbe5697669 100644
--- a/pkgs/development/tools/datree/default.nix
+++ b/pkgs/development/tools/datree/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "datree";
- version = "1.6.33";
+ version = "1.6.37";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = version;
- hash = "sha256-VuTa1bnwxk8SUvOK3jLEvgJTPf3eABUyBssUYtoAxTs=";
+ hash = "sha256-oDwI4rlpTkriPD2YC8AnlPYHUchC7btYyX/X8sxmvac=";
};
vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw=";
diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix
index 0127773befe..3af0ef31524 100644
--- a/pkgs/development/tools/goda/default.nix
+++ b/pkgs/development/tools/goda/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goda";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "loov";
repo = "goda";
rev = "v${version}";
- sha256 = "sha256-gXpO0DvxghyJIIxjE/KGjF/uRQ5W3p5QhqtmzeDmAfA=";
+ sha256 = "sha256-qBuhwIQvfUZMyzCJ/7Kedc+InrGwpcLhDLvX9i0ws2A=";
};
- vendorSha256 = "sha256-OyQEw6mRrRneo3T8wns0doU4lxJYEoilTd30xctLBJ4=";
+ vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms=";
passthru.updateScript = nix-update-script {
attrPath = pname;
diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix
index afe20aef049..883e88866b7 100644
--- a/pkgs/development/tools/millet/default.nix
+++ b/pkgs/development/tools/millet/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
- version = "0.3.14";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-fi0kU1+gazSfQEyL3qYcK/qeMh1UGuitGXJ9FsVAiTw=";
+ sha256 = "sha256-7CIi1a3SyuJzvBrjTE5wS7xKXEVdmUu2RUVeL3P//z8=";
};
- cargoSha256 = "sha256-ijXGXq5+OOnf4Nmg68GcSKZe/5tjG0KebOsCWU+vmHc=";
+ cargoSha256 = "sha256-Dg/dq2/q+snqbkX1fR/mgKozfKZlZOuT5vXFTuu0AiY=";
postPatch = ''
rm .cargo/config.toml
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix
index b60dfa7f446..7570dd586f0 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.2";
+ version = "0.29.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-oPBk5mTCq8nn4olC9Z7ROvrfAUXDxnWhm8w20sh5Wkw=";
+ sha256 = "sha256-CYbeRhwoffyELM0REZL14m4tTe/66GDToqNKcEfmums=";
};
- vendorSha256 = "sha256-5Pb1mr3rYPcWFLjETAZp8rLW32n+RyCm7NbfooM4hZs=";
+ vendorSha256 = "sha256-wbB3/RfzL05SaLv49gs7WKrjV//dM3SjpbMNGI1yH4I=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index 55198659371..782e0f287c5 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
- version = "0.0.72";
+ version = "0.0.75";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-K2wrPDb0GcwhGzLFNGXMH7CKTleOHwe3FtA82BZk+Bo=";
+ sha256 = "sha256-+2ussKBWgsbl2h+IQACwXKvLwdhJNfTG1A0W/BLmNHA=";
};
- cargoSha256 = "sha256-acB8kcdItJyE2Mr+fU0yojpDJh02V21DZfqQ5q+Wn20=";
+ cargoSha256 = "sha256-3/tLUzxzZCYgEruYrRSfzfvx84ewpprf2lJlZM2JvYM=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices
diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix
index 4ad70bfa9ed..e4ff582964f 100644
--- a/pkgs/development/tools/rust/cargo-pgx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgx/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
- version = "0.4.5";
+ version = "0.5.0";
src = fetchCrate {
inherit version pname;
- sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ=";
+ sha256 = "sha256-5UH34l4zmKFZY2uHLDqJ1kW/QRQbII0/zmmGA3DFKB4=";
};
- cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw=";
+ cargoSha256 = "sha256-1CU/VrNS3tGycjel5MV6SrZJ7LExds2YhdO+VAHgusM=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index 3bcc9523b96..5dc829d861e 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -8,14 +8,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-59A3RPdltDfMDPTFbBHcnJoFEp718xvYgg6v4MvsxaQ=";
+ sha256 = "sha256-aDkQxt516cN27wtndSkBitoWZvPyaQETqZDHYlrr364=";
};
- cargoSha256 = "sha256-GEttxHtdOYMijv1xxK7U0d8WNwJcpqJNgDYKgCV/zVw=";
+ cargoSha256 = "sha256-EBVPUCQQ9rwl23vYOpCBtOBb8d3K53RPMkIUs6sQyyU=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index bbf4b899e22..e3cbedd5b75 100644
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lYQmuenL7cbgfb6tdhdxkNe3wrQj7hTijyrhr/p4zLo=";
+ sha256 = "sha256-XeeMROSO012vo9nOsVUdFFLTj+9mSYtg+EFHJxs+kl0=";
};
- cargoSha256 = "sha256-Ae0ootHGbW5FJTkIRc9lTKHWsHOz6/WZCWCLZlSROU4=";
+ cargoSha256 = "sha256-KuxGUDS2xJLa32mON+JI7tT+zAheOk7M5FYtSDJlF1A=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index 0ab9da2bf8a..920afba2a30 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -17,6 +17,9 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-X github.com/Shopify/toxiproxy/v2.Version=${version}" ];
+ # Fixes tests on Darwin
+ __darwinAllowLocalNetworking = true;
+
checkFlags = [ "-short" ];
postInstall = ''
diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix
index f91d00f6a6f..958bdd12f79 100644
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
- version = "0.1.13";
+ version = "0.2.0";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
- sha256 = "RYTRcc8xccRmxuKOXwX3bBWJSXLI2/XfH4/7ZdcUBdE=";
+ sha256 = "fqV/HBezVUw7qVPC412znpDv7pFh0b91ISy2ONedXgA=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
- sha256 = "LixLrzSsgbXyfpFKiksM4zNS5iDU3tXOrr7fP8yJknM=";
+ sha256 = "e/3G+psqujxjS0/mNm5jbJHPVKgM6JiMhp6RQSG51Rs=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
- sha256 = "SGZcT2uVy6egr99FzyaykUWLuZBqDsvbCM/lsgy//g0=";
+ sha256 = "8Obcl9nZDtC6hstDSroJFYkD3iXi/mKmJKBjo2HJQj0=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
- sha256 = "ssZtJi+CEVn7MjPMqFkwv1lnwE7a7ttkmiuoT0Y6wao=";
+ sha256 = "C87tUgJkVSj8EM1xcmHQ+QTiZPBiwjeb7wk2+jpSe10=";
};
};
updateScript = writeShellScript "update-bun" ''
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index ad576b46424..737fed1e7f6 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -7,7 +7,7 @@
, SDL_ttf
, SDL_mixer
, libmysqlclient
-, wxGTK
+, wxGTK32
, symlinkJoin
, runCommandLocal
, makeWrapper
@@ -31,7 +31,7 @@ let
SDL_ttf
SDL_mixer
libmysqlclient
- wxGTK
+ wxGTK32
coreutils
];
hardeningDisable = [ "format" ];
@@ -74,7 +74,8 @@ let
];
postPatch = ''
substituteInPlace zod_launcher_src/zod_launcherFrm.cpp \
- --replace 'message = wxT("./zod");' 'message = wxT("zod");'
+ --replace 'message = wxT("./zod");' 'message = wxT("zod");' \
+ --replace "check.replace(i,1,1,'_');" "check.replace(i,1,1,(wxUniChar)'_');"
'';
preBuild = "cd zod_launcher_src";
installPhase = ''
@@ -106,5 +107,6 @@ in
homepage = "http://zod.sourceforge.net/";
maintainers = with maintainers; [ zeri ];
license = licenses.gpl3Plus; /* Says the website */
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index 6e838803dea..4d3aec01439 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,28 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, SDL2, wxGTK } :
-
-stdenv.mkDerivation rec {
+{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }:
+stdenv.mkDerivation {
pname = "sound-of-sorting";
- version = "2017-12-23";
+ version = "unstable-2022-10-12";
src = fetchFromGitHub {
owner = "bingmann";
repo = "sound-of-sorting";
- rev = "5884a357af5775fb57d89eb028d4bf150760db75";
- sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8";
+ rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b";
+ sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8=";
};
- buildInputs =
- [ wxGTK SDL2 ];
+ nativeBuildInputs = [ pkg-config ];
- preConfigure = ''
- export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config
- '';
+ buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
meta = with lib; {
description = "Audibilization and Visualization of Sorting Algorithms";
homepage = "https://panthema.net/2013/sound-of-sorting/";
- license = with licenses; gpl3;
+ license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
};
}
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 3a71563593e..2e076063458 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -505,6 +505,11 @@ let
# Depends on MODULE_SIG and only really helps when you sign your modules
# and enforce signatures which we don't do by default.
SECURITY_LOCKDOWN_LSM = option no;
+
+ # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis
+ PERSISTENT_KEYRINGS = yes;
+ # enable temporary caching of the last request_key() result
+ KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes;
} // optionalAttrs (!stdenv.hostPlatform.isAarch32) {
# Detect buffer overflows on the stack
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 3cb3042b0e3..10741e7d1fd 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "5.19.12"; #zen
- suffix = "zen1"; #zen
- sha256 = "001zrsgsg5yl74yn4qdmykwmys4mdwnnbiqmfpw60i3qr5ig90ap"; #zen
+ version = "6.0.1"; #zen
+ suffix = "zen2"; #zen
+ sha256 = "172xacqqkrnrbgf2sy158wny4dpb92isilq0p4x700xxrvvz4ag2"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "5.19.12"; #lqx
- suffix = "lqx1"; #lqx
- sha256 = "19y3znj3zjifkd1m8agb8f80kzfs1rx1ccpnq7fvkd7j4yd3khlf"; #lqx
+ version = "5.19.15"; #lqx
+ suffix = "lqx2"; #lqx
+ sha256 = "1zqfgxcba24y0v3xd249rbqvd92lcf3s888mmqwidxcdjqlj5kc8"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 1ec98cc7b34..99382ad4aae 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -37,10 +37,11 @@ rec {
};
latest = selectHighestVersion production (generic {
- version = "495.46";
- sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU=";
- settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk=";
- persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI=";
+ version = "520.56.06";
+ sha256_64bit = "sha256-UWdLAL7Wdm7EPUHKhNGNaTkGI0+FUZBptqNB92wRPEY=";
+ openSha256 = "sha256-miIxF/0fA7v8fU+oh/mx0DRqJdPBzmz14IqgPWJQeKU=";
+ settingsSha256 = "sha256-NeT3tb7NGicKHnNkuOwbte6BJsP1bUzPSE+TXnevCAM=";
+ persistencedSha256 = "sha256-3nWtnwpLaal3ty8GNMFa4zeonT8nKpYs6DIgsAq9+84=";
});
beta = selectHighestVersion latest (generic {
diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix
index edaf2b5c814..f1a4c9b7bb3 100644
--- a/pkgs/os-specific/linux/system76-power/default.nix
+++ b/pkgs/os-specific/linux/system76-power/default.nix
@@ -2,22 +2,24 @@
rustPlatform.buildRustPackage rec {
pname = "system76-power";
- version = "1.1.20";
+ version = "1.1.23";
src = fetchFromGitHub {
owner = "pop-os";
repo = "system76-power";
rev = version;
- sha256 = "sha256-Qk9zHqwFlUTWE+YRt2GASIekbDoBCHPAUUN3+0wpvfw=";
+ sha256 = "sha256-RuYDG4eZE599oa04xUR+W5B3/IPOpQUss1x7hzoydUQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus libusb1 ];
- cargoSha256 = "sha256-iG7M9ICFRTFVkbC89DyfR+Iyi7jaT9WmG3PSdBOF7YI=";
+ cargoSha256 = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0=";
postInstall = ''
- install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf
+ install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf
+ install -D -m 0644 data/com.system76.PowerDaemon.policy $out/share/polkit-1/actions/com.system76.PowerDaemon.policy
+ install -D -m 0644 data/com.system76.PowerDaemon.xml $out/share/dbus-1/interfaces/com.system76.PowerDaemon.xml
'';
meta = with lib; {
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 51088486809..37d6b7251a3 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -7,7 +7,7 @@
, installShellFiles
}:
let
- version = "2.6.1";
+ version = "2.6.2";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
@@ -23,20 +23,16 @@ buildGoModule {
owner = "caddyserver";
repo = "caddy";
rev = "v${version}";
- sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo=";
+ sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0=";
};
- vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI=";
-
- patches = [
- ./inject_version.diff
- ];
+ vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY=";
subPackages = [ "cmd/caddy" ];
ldflags = [
"-s" "-w"
- "-X github.com/caddyserver/caddy/v2.ShortVersion=${version}"
+ "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
];
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/servers/caddy/inject_version.diff b/pkgs/servers/caddy/inject_version.diff
deleted file mode 100644
index 3636f026a77..00000000000
--- a/pkgs/servers/caddy/inject_version.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/caddy.go b/caddy.go
-index 584865bd..082b9b6c 100644
---- a/caddy.go
-+++ b/caddy.go
-@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) {
- // and https://github.com/golang/go/issues/50603.
- //
- // This function is experimental and subject to change or removal.
-+var ShortVersion = "(devel)"
-+
- func Version() (simple, full string) {
-+ return ShortVersion, ShortVersion
- // the currently-recommended way to build Caddy involves
- // building it as a dependency so we can extract version
- // information from go.mod tooling; once the upstream
\ No newline at end of file
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index a02a6d64498..263d03616cd 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
- version = "22.05.4.1";
+ version = "22.05.5.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
- sha256 = "100ixhpi4ahx5w7b1ncgmmg1ar48brp095lrxhcxr55fq2wqlv35";
+ sha256 = "1mw0dkll1iwwdpdbxcy26zpnjgj07prlgdz2da64krn4yyfhca30";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix
index 51b3abce6f6..38626c52c9e 100644
--- a/pkgs/servers/dendrite/default.nix
+++ b/pkgs/servers/dendrite/default.nix
@@ -3,19 +3,16 @@
buildGoModule rec {
pname = "matrix-dendrite";
- version = "0.10.1";
+ version = "0.10.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "dendrite";
rev = "v${version}";
- sha256 = "sha256-o+vdxjxbgTPhXtmjrMXf/kBGYaaF3nvVnrG+PGnaM70=";
+ sha256 = "sha256-ziKVv5ql1gIAIYpsRCV9f9y711hYz24M1Z+mGWO1vqs=";
};
- vendorSha256 = "sha256-sd2frDxtMd0YUVCCQGaNYU7KopZQC1Ld5OHnjttTrgA=";
-
- # some tests are racy, re-enable once upstream has fixed them
- doCheck = false;
+ vendorSha256 = "sha256-p1UmHIM4h6oe5PRSPD8rtEJpwypTxN1IHzge0Me/9mQ=";
checkInputs = [
postgresqlTestHook
@@ -37,6 +34,7 @@ buildGoModule rec {
meta = with lib; {
homepage = "https://matrix-org.github.io/dendrite";
description = "A second-generation Matrix homeserver written in Go";
+ changelog = "https://github.com/matrix-org/dendrite/releases/tag/v${version}";
license = licenses.asl20;
maintainers = teams.matrix.members;
platforms = platforms.unix;
diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix
index f6415ee72ac..0491e0e75eb 100644
--- a/pkgs/servers/endlessh-go/default.nix
+++ b/pkgs/servers/endlessh-go/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "endlessh-go";
- version = "20220731";
+ version = "20221012";
src = fetchFromGitHub {
owner = "shizunge";
repo = "endlessh-go";
rev = version;
- sha256 = "sha256-xV9VCbpd6JC/m3RXJt0v8WCCGs8UpZLvAv3bzPRrae4=";
+ sha256 = "sha256-qgwOaqRyMiN3+vnwzwNet7jMQzgmFb09AVfYFwCAQJI=";
};
- vendorSha256 = "sha256-YGVLntDnOX55IoIHIn0z1K7V/PhRLruEASfAGQsTUkk=";
+ vendorSha256 = "sha256-8W0yh+/FPIf6M5JipwbpLseKEdo4uVRmtsYYqfkwENU=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix
index db4b335e666..4b84ca3e356 100644
--- a/pkgs/servers/rmfakecloud/default.nix
+++ b/pkgs/servers/rmfakecloud/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, callPackage, enableWebui ? true }:
buildGoModule rec {
pname = "rmfakecloud";
@@ -13,8 +13,12 @@ buildGoModule rec {
vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A=";
- postPatch = ''
- # skip including the JS SPA, which is difficult to build
+ ui = callPackage ./webui.nix { inherit version src; };
+
+ postPatch = if enableWebui then ''
+ mkdir -p ui/build
+ cp -r ${ui}/* ui/build
+ '' else ''
sed -i '/go:/d' ui/assets.go
'';
diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix
new file mode 100644
index 00000000000..8b636baec11
--- /dev/null
+++ b/pkgs/servers/rmfakecloud/webui.nix
@@ -0,0 +1,37 @@
+{ version, src, stdenv, lib, fetchFromGitHub, fetchYarnDeps, fixup_yarn_lock, yarn, nodejs }:
+
+stdenv.mkDerivation rec {
+ inherit version src;
+
+ pname = "rmfakecloud-webui";
+
+ yarnOfflineCache = fetchYarnDeps {
+ yarnLock = "${src}/ui/yarn.lock";
+ sha256 = "sha256-lKA3W7gXT2Dnux+sIXCluG5HxkGQgHPnCjgV/a4pjY0=";
+ };
+
+ nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ];
+
+ buildPhase = ''
+ export HOME=$(mktemp -d)
+ cd ui
+ fixup_yarn_lock yarn.lock
+ yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
+ yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
+ patchShebangs node_modules
+ export PATH=$PWD/node_modules/.bin:$PATH
+ ./node_modules/.bin/react-scripts build
+ mkdir -p $out
+ cd ..
+ '';
+
+ installPhase = ''
+ cp -r ui/build/* $out
+ '';
+
+ meta = with lib; {
+ description = "Only the webui files for rmfakecloud";
+ homepage = "https://ddvk.github.io/rmfakecloud/";
+ license = licenses.agpl3Only;
+ };
+}
diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix
index f6178dba992..ef23614f436 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.18.5";
+ version = "2.18.6";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
- sha256 = "sha256-JfKxeXLlK4n2BQwJa2JV5VHtNfW6W9cdd+9W+MnxZZo=";
+ sha256 = "sha256-BoRumpU9HjkNDr113LvIGmpsLlRJtAmGhSBcUoGO8Vc=";
};
sourceRoot = "snappymail";
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 942ede62706..a5bdbc97838 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -245,4 +245,13 @@ in self: {
thisAttr = "postgresql_14";
inherit self;
};
+
+ postgresql_15 = self.callPackage generic {
+ version = "15.0";
+ psqlSchema = "15";
+ hash = "sha256-cux09KfBbmhPQ+pC4hVJf81MVdAopo+3LpnmH/QNpNY=";
+ this = self.postgresql_15;
+ thisAttr = "postgresql_15";
+ inherit self;
+ };
}
diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
index 4d1d3326457..9ceabbe972a 100644
--- a/pkgs/servers/sql/postgresql/ext/periods.nix
+++ b/pkgs/servers/sql/postgresql/ext/periods.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "periods";
- version = "1.2";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "xocolatl";
repo = pname;
rev = "v${version}";
- sha256 = "13aix61qzlb7cs042dz4x0z4sc2xayg4nzi2cks46zibxm5i4gzm";
+ sha256 = "sha256-XAqjP8Cih+HzqlI8XjgCNzSVQSbaetLRvJReiwHdaIc=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 561c16c9645..c95e4d8174d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_partman";
- version = "4.7.0";
+ version = "4.7.1";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "sha256-Hbg3lf9XEIt5r4sYW+1r1tu6GyBgRXQxrPRWNuZPsvM=";
+ sha256 = "sha256-XewRIzue38aXhjU6GKEiuUyY+6ngtyQLhCl3/T6Al+A=";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 626e4e0290b..83c3ac0796a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "pg_repack";
- version = "1.4.7";
+ version = "1.4.8";
buildInputs = [ postgresql openssl zlib readline ];
src = fetchFromGitHub {
owner = "reorg";
repo = "pg_repack";
- rev = "refs/tags/ver_${version}";
- sha256 = "12j8crgljvkm9dz790xcsr8l7sv8ydvb2imrb0jh1jvj0r9yg1v5";
+ rev = "f42c1bd707bd5d69a9eb33494133db2e47a2c05a"; # no release tag
+ sha256 = "sha256-pZjspnmPTXS/SbyLAd7vcoF01cbC6PnxZjuto4lUuQA=";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
index afa08a8cdce..c0c9c310442 100644
--- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "pgjwt";
- version = "unstable-2017-04-24";
+ version = "unstable-2021-11-13";
src = fetchFromGitHub {
owner = "michelp";
repo = "pgjwt";
- rev = "546a2911027b716586e241be7fd4c6f1785237cd";
- sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf";
+ rev = "9742dab1b2f297ad3811120db7b21451bca2d3c9";
+ sha256 = "sha256-Hw3R9bMGDmh+dMzjmqZSy/rT4mX8cPU969OJiARFg10=";
};
dontBuild = true;
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 6afbacca812..05be683f1ff 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
- version = "2.3.9";
+ version = "2.4.0";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
- sha256 = "sha256-qCS0ndupiRUSI0+BX+o56dgDN9/jPLPdAD16N+gGHqo=";
+ sha256 = "sha256-W6quDn2B+BZ+J46aNMbtVq7OizT1q5jyKMZECAk0F7M=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index ddc51e8d2b7..c04cb0c3b15 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, postgresql }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }:
stdenv.mkDerivation rec {
pname = "pgvector";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-kIgdr3+KC11Qxk1uBTmcN4dDaLIhfo/Fs898boESsBc=";
};
+ patches = [
+ # Added support for Postgres 15. Remove with the next release.
+ (fetchpatch {
+ url = "https://github.com/pgvector/pgvector/commit/c9c6b96eede7d78758ca7ca5db98bf8b24021d0f.patch";
+ sha256 = "sha256-hgCpGtuYmqo4Ttlpn4FBskbNdZmM1wJeMQBJZ7H923g=";
+ })
+ ];
+
buildInputs = [ postgresql ];
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index a38b6a5ecba..0650cf8a7b2 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0x7alz0EySMcqi4yZm5z6pZeL6glf8AYHG+dVBBtnIU=";
+ sha256 = "sha256-Nxq4wpOWYt4oyoLxERWPhlEwWmLiDEk27EFyDtW/BfI=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
index 3f3b2aa4f14..582451b3ba4 100644
--- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
+++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }:
+{ lib, stdenv, fetchFromGitHub, postgresql }:
stdenv.mkDerivation {
pname = "tsearch-extras";
@@ -11,7 +11,6 @@ stdenv.mkDerivation {
sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba";
};
- nativenativeBuildInputs = [ pkg-config ];
buildInputs = [ postgresql ];
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
index d00e3a17532..f9e01a7bd51 100644
--- a/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }:
+{ lib, stdenv, fetchFromGitHub, postgresql }:
stdenv.mkDerivation rec {
pname = "wal2json";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "eulerto";
repo = "wal2json";
rev = "wal2json_${builtins.replaceStrings ["."] ["_"] version}";
- sha256 = "sha256-EB+tCaILWsU9fDhqosl6EyMoYBd6SHISFfyxiZ9pNOk=";
+ sha256 = "sha256-Gpc9uDKrs/dmVSFgdgHM453+TaEnhRh9t0gDbSn8FUI=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 676e1be3ec3..5c988c59f90 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -24,16 +24,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.68.1";
+ version = "0.69.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-PE6UewAE7z0Ie5aFocDK3Qu0Y4ppuPtpD6tDnYfM11Y=";
+ sha256 = "sha256-aEEuzl3HRWNk2zJq+Vh5ZLyT26Qk7oI3bQKUr4SlDr8=";
};
- cargoSha256 = "sha256-7guFkR/paL8jk5YwiRNMbWCyA6DqOaLGTmbWHAWDxRw=";
+ cargoSha256 = "sha256-qaBiTZUe4RSYdXAEWPVv0ATWDN/+aOYiEpq+oztwNEc=";
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];
@@ -66,7 +66,9 @@ rustPlatform.buildRustPackage rec {
# TODO investigate why tests are broken on darwin
# failures show that tests try to write to paths
# outside of TMPDIR
- doCheck = ! stdenv.isDarwin;
+ # doCheck = ! stdenv.isDarwin;
+ # TODO tests are not guaranteed while package is in beta
+ doCheck = false;
checkPhase = ''
runHook preCheck
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix
index dc8ce72d99d..a068ce7dc9f 100644
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@@ -7,11 +7,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "mycli";
- version = "1.25.0";
+ version = "1.26.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-/vEu2BJf0T7fSgSXflq56Ilaih7RAhhilZUgbNzZYQg=";
+ sha256 = "sha256-jAMDXJtFJtv6CwhZZU4pdKDndZKp6bJ/QPWo2q6DvrE=";
};
propagatedBuildInputs = [
@@ -26,6 +26,7 @@ buildPythonApplication rec {
pygments
pymysql
pyperclip
+ sqlglot
sqlparse
];
@@ -41,8 +42,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" \
- --replace "importlib_resources >= 5.0.0" "importlib_resources"
+ --replace "cryptography == 36.0.2" "cryptography"
'';
meta = with lib; {
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index b3f7a26086e..0961ad904f3 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libconfuse, gettext }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libconfuse, gettext }:
stdenv.mkDerivation rec {
pname = "genimage";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-hp+WYtO3eMabHR/nDfZY4cnpCu2iart1P2/lXosMbnM=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libconfuse gettext ];
postInstall = ''
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix
index 720b0a875a8..1e0ad4079d6 100644
--- a/pkgs/tools/misc/arp-scan/default.nix
+++ b/pkgs/tools/misc/arp-scan/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "arp-scan";
- version = "1.9.7";
+ version = "1.9.8";
src = fetchFromGitHub {
owner = "royhills";
repo = "arp-scan";
rev = version;
- sha256 = "1mf7a4f9vzvnkiavc87aqyciswggsb4fpy7j05jxnvjyyxv3l7gp";
+ sha256 = "sha256-zSihemqGaQ5z6XjA/dALoSJOuAkxF5/nnV6xE+GY7KI=";
};
perlModules = with perlPackages; [
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 3fa25c6d86c..1eca3b71db0 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.24.0";
+ version = "2.25.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-HXQdUxc622Pq9NoXa0MPk1yjmDvyYe67RxM6AJ8roN0=";
+ sha256 = "sha256-a7Qf0mKo1aWABftgIDgh94mJf49d7KAtBkemRNRash0=";
};
- vendorSha256 = "sha256-A9l4YbZWdmhoAz6PqFufWGxSnY3TbZfVqXnu+ZWLnQA=";
+ vendorSha256 = "sha256-jqK115vnEYlER3sAFVFlMFGjpMnAIMlFM+4oN8Ujad4=";
doCheck = false;
diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix
index 035d2cb9702..e297bc532dc 100644
--- a/pkgs/tools/misc/csv2latex/default.nix
+++ b/pkgs/tools/misc/csv2latex/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "csv2latex";
- version = "0.22";
+ version = "0.23.1";
src = fetchurl {
url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz";
- sha256 = "09qih2zx6cvlii1n5phiinvm9xw1l8f4i60b5hg56pymzjhn97vy";
+ sha256 = "sha256-k1vQyrVJmfaJ7jVaoW2dkPD7GO8EoDqJY5m8O2U/kYw=";
};
installPhase = ''
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index 985cc472138..b66a59c960f 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lazydocker";
- version = "0.18.1";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
- sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA=";
+ sha256 = "sha256-Ns758mqz4O8hKpu3LHFFm1U1vxF1TJZ4GKstWADXOl0=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index ac3ff7a59b7..bebe77faaa7 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -2,31 +2,21 @@
, lib
, buildGoModule
, fetchFromGitHub
-, fetchurl
, Cocoa
, installShellFiles
}:
buildGoModule rec {
pname = "noti";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "variadico";
repo = "noti";
rev = version;
- sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd";
+ sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA=";
};
- patches = [
- # update golang.org/x/sys to fix building on aarch64-darwin
- # using fetchurl because fetchpatch breaks the patch
- (fetchurl {
- url = "https://github.com/variadico/noti/commit/a90bccfdb2e6a0adc2e92f9a4e7be64133832ba9.patch";
- sha256 = "sha256-vSAwuAR9absMSFqGOlzmRZoOGC/jpkmh8CMCVjeleUo=";
- })
- ];
-
vendorSha256 = null;
nativeBuildInputs = [ installShellFiles ];
@@ -39,8 +29,12 @@ buildGoModule rec {
"-X github.com/variadico/noti/internal/command.Version=${version}"
];
+ preCheck = ''
+ export PATH=$out/bin:$PATH
+ '';
+
postInstall = ''
- installManPage docs/man/*
+ installManPage docs/man/dist/*
'';
meta = with lib; {
@@ -48,7 +42,8 @@ buildGoModule rec {
longDescription = ''
Monitor a process and trigger a notification.
- Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone.
+ Never sit and wait for some long-running process to finish. Noti can alert
+ you when it's done. You can receive messages on your computer or phone.
'';
homepage = "https://github.com/variadico/noti";
license = licenses.mit;
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index 4c455d6fb2d..7fef96dae31 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -142,6 +142,10 @@ buildPythonPackage rec {
"test_install_existing_hooks_no_overwrite"
"test_installed_from_venv"
"test_uninstall_restores_legacy_hooks"
+
+ # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`,
+ # but we use an absolute path so it's not an issue.
+ "test_environment_not_sourced"
];
pythonImportsCheck = [
diff --git a/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/pkgs/tools/misc/pre-commit/hook-tmpl.patch
index 1d5fd17274b..56aa59ef483 100644
--- a/pkgs/tools/misc/pre-commit/hook-tmpl.patch
+++ b/pkgs/tools/misc/pre-commit/hook-tmpl.patch
@@ -1,15 +1,17 @@
diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl
-index 53d29f9..66a8ad3 100755
+index 53d29f9..9b5dc2c 100755
--- a/pre_commit/resources/hook-tmpl
+++ b/pre_commit/resources/hook-tmpl
-@@ -10,9 +10,7 @@ ARGS=(hook-impl)
+@@ -10,11 +10,4 @@ ARGS=(hook-impl)
HERE="$(cd "$(dirname "$0")" && pwd)"
ARGS+=(--hook-dir "$HERE" -- "$@")
-if [ -x "$INSTALL_PYTHON" ]; then
- exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}"
-elif command -v pre-commit > /dev/null; then
-+if command -v pre-commit > /dev/null; then
- exec pre-commit "${ARGS[@]}"
- else
- echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2
+- exec pre-commit "${ARGS[@]}"
+-else
+- echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2
+- exit 1
+-fi
++exec @pre-commit@/bin/pre-commit "${ARGS[@]}"
diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/tools/misc/todo/default.nix
index c11961d0c42..dc63a1c04b6 100644
--- a/pkgs/tools/misc/todo/default.nix
+++ b/pkgs/tools/misc/todo/default.nix
@@ -1,30 +1,21 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, stdenv
-, openssl
-}:
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, stdenv, openssl }:
rustPlatform.buildRustPackage rec {
pname = "todo";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "sioodmy";
repo = "todo";
rev = version;
- sha256 = "Z3kaCNZyknNHkZUsHARYh3iWWR+v//JhuYoMIrq54Wo=";
+ sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
};
- cargoSha256 = "82xB+9kiLBwCE6yC3tlmgzJJgA1cMDq6Mjc48GBZ9B8=";
+ cargoSha256 = "B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
- preFixup = ''
- mv $out/bin/todo-bin $out/bin/todo
- '';
meta = with lib; {
description = "Simple todo cli program written in rust";
homepage = "https://github.com/sioodmy/todo";
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index d4c099feb10..fa17625d592 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -12,19 +12,19 @@
stdenv.mkDerivation rec {
pname = "uutils-coreutils";
- version = "0.0.15";
+ version = "0.0.16";
src = fetchFromGitHub {
owner = "uutils";
repo = "coreutils";
rev = version;
- sha256 = "sha256-q17YR95Iuw2382xDP1xA/X6u7NM6pW4OkJu4FpohtkA=";
+ sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-8/nMf1NHGn4ITPnx5315XdirrMPkRtYd2IV9MvxVVAE=";
+ hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M=";
};
nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index ebf2f082db0..2fb2f82ba80 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -20,10 +20,10 @@
# nix has a problem with the `?` in the feature list
# enabling kafka will produce a vector with no features at all
, enableKafka ? false
- # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*"
+ # TODO investigate adding "vrl-cli" and various "vendor-*"
# "disk-buffer" is using leveldb TODO: investigate how useful
# it would be, perhaps only for massive scale?
-, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ]
+, features ? ([ "api" "api-client" "sinks" "sources" "transforms" "vrl-cli" ]
# the second feature flag is passed to the rdkafka dependency
# building on linux fails without this feature flag (both x86_64 and AArch64)
++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix
new file mode 100644
index 00000000000..dafff67ecfd
--- /dev/null
+++ b/pkgs/tools/misc/xq/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, rustPlatform
+, fetchCrate
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "xq";
+ version = "0.2.39";
+
+ src = fetchCrate {
+ inherit pname version;
+ sha256 = "sha256-eyQ38Ld/sVI5vvQRohGfu+cXNtS3nTOBwxiO9BqjxhM=";
+ };
+
+ cargoSha256 = "sha256-LajK6OaH6uwnwXvOSJCY/oTtAd2+mcFTWghxC5mVAjQ=";
+
+ meta = with lib; {
+ description = "Pure rust implementation of jq";
+ homepage = "https://github.com/MiSawa/xq";
+ license = licenses.mit;
+ maintainers = with maintainers; [ matthewcroughan ];
+ };
+}
diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/tools/networking/ripe-atlas-tools/default.nix
index 5ca1cd41065..0c415c65b8e 100644
--- a/pkgs/tools/networking/ripe-atlas-tools/default.nix
+++ b/pkgs/tools/networking/ripe-atlas-tools/default.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
];
preBuild = ''
- echo "RIPE Atlas Tools [NixOS ${lib.trivial.version}] ${version}" > ripe/atlas/tools/user-agent
+ echo "RIPE Atlas Tools [NixOS ${version}" > ripe/atlas/tools/user-agent
'';
postInstall = ''
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index 3e156cf3132..15baee3c39d 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "diffstat";
- version = "1.64";
+ version = "1.65";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz"
"https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz"
];
- sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w=";
+ sha256 = "sha256-jPJ0JJJt682FkhdVw5FVWSiCRL0QP2LXQNxrg7VXooo=";
};
meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c22d3d1b49..6ea814b98af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1580,7 +1580,15 @@ with pkgs;
melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
- mgba = libsForQt5.callPackage ../applications/emulators/mgba { };
+ mgba = callPackage ../applications/emulators/mgba {
+ ffmpeg = ffmpeg_4;
+ lua = lua5_4;
+ inherit (libsForQt5)
+ qtbase
+ qtmultimedia
+ qttools
+ wrapQtAppsHook;
+ };
mupen64plus = callPackage ../applications/emulators/mupen64plus { };
@@ -2600,6 +2608,8 @@ with pkgs;
git-privacy = callPackage ../development/tools/git-privacy { };
+ git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { };
+
git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { };
git-revise = with python3Packages; toPythonApplication git-revise;
@@ -4767,6 +4777,8 @@ with pkgs;
spacevim = callPackage ../applications/editors/spacevim { };
+ srvc = callPackage ../applications/version-management/srvc { };
+
ssmsh = callPackage ../tools/admin/ssmsh { };
stacs = callPackage ../tools/security/stacs { };
@@ -11286,6 +11298,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
+ boost-sml = callPackage ../development/libraries/boost-ext/boost-sml {};
+
smu = callPackage ../tools/text/smu { };
smug = callPackage ../tools/misc/smug { };
@@ -23924,12 +23938,14 @@ with pkgs;
postgresql_12
postgresql_13
postgresql_14
+ postgresql_15
;
postgresql = postgresql_14.override { this = postgresql; };
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
+ postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
postgresql14Packages = postgresqlPackages;
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
@@ -27312,6 +27328,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
+ cyan = callPackage ../applications/graphics/cyan {};
+
cyanrip = callPackage ../applications/audio/cyanrip { };
centerim = callPackage ../applications/networking/instant-messengers/centerim { };
@@ -27895,6 +27913,8 @@ with pkgs;
icesl = callPackage ../applications/misc/icesl { };
+ karlender = callPackage ../applications/office/karlender { };
+
keepassx = callPackage ../applications/misc/keepassx { };
keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };
@@ -28596,6 +28616,8 @@ with pkgs;
moe = callPackage ../applications/editors/moe { };
+ pattypan = callPackage ../applications/misc/pattypan {};
+
praat = callPackage ../applications/audio/praat { };
quvi = callPackage ../applications/video/quvi/tool.nix {
@@ -33282,6 +33304,12 @@ with pkgs;
taro = callPackage ../applications/blockchains/taro { };
+ inherit (callPackages ../applications/blockchains/teos {
+ inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+ })
+ teos
+ teos-watchtower-plugin;
+
terra-station = callPackage ../applications/blockchains/terra-station { };
tessera = callPackage ../applications/blockchains/tessera { };
@@ -36729,6 +36757,8 @@ with pkgs;
xlockmore = callPackage ../misc/screensavers/xlockmore { };
+ xq = callPackage ../tools/misc/xq { };
+
xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };
sailsd = callPackage ../misc/sailsd { };
@@ -36828,7 +36858,9 @@ with pkgs;
soundmodem = callPackage ../applications/radio/soundmodem {};
- soundOfSorting = callPackage ../misc/sound-of-sorting { };
+ soundOfSorting = callPackage ../misc/sound-of-sorting {
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
sourceAndTags = callPackage ../misc/source-and-tags {
hasktags = haskellPackages.hasktags;