Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
df0375a9b2
@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
|
||||
```nix
|
||||
{ lib
|
||||
, stdenv
|
||||
, zig_0_11
|
||||
, zig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
# . . .
|
||||
|
||||
nativeBuildInputs = [
|
||||
zig_0_11.hook
|
||||
zig.hook
|
||||
];
|
||||
|
||||
zigBuildFlags = [ "-Dman-pages=true" ];
|
||||
|
||||
@ -632,6 +632,11 @@ in mkLicense lset) ({
|
||||
url = "https://old.calculate-linux.org/packages/licenses/iASL";
|
||||
};
|
||||
|
||||
icu = {
|
||||
spdxId = "ICU";
|
||||
fullName = "ICU";
|
||||
};
|
||||
|
||||
ijg = {
|
||||
spdxId = "IJG";
|
||||
fullName = "Independent JPEG Group License";
|
||||
|
||||
@ -429,6 +429,12 @@
|
||||
githubId = 1517066;
|
||||
name = "Aiken Cairncross";
|
||||
};
|
||||
a-camarillo = {
|
||||
name = "Anthony Camarillo";
|
||||
email = "anthony.camarillo.96@gmail.com";
|
||||
github = "a-camarillo";
|
||||
githubId = 58638902;
|
||||
};
|
||||
aciceri = {
|
||||
name = "Andrea Ciceri";
|
||||
email = "andrea.ciceri@autistici.org";
|
||||
@ -2943,6 +2949,12 @@
|
||||
fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E";
|
||||
}];
|
||||
};
|
||||
b-rodrigues = {
|
||||
email = "bruno@brodrigues.co";
|
||||
github = "b-rodrigues";
|
||||
githubId = 2998834;
|
||||
name = "Bruno Rodrigues";
|
||||
};
|
||||
broke = {
|
||||
email = "broke@in-fucking.space";
|
||||
github = "broke";
|
||||
@ -3018,6 +3030,12 @@
|
||||
githubId = 37375448;
|
||||
name = "Buildit";
|
||||
};
|
||||
buurro = {
|
||||
email = "marcoburro98@gmail.com";
|
||||
github = "buurro";
|
||||
githubId = 9320677;
|
||||
name = "Marco Burro";
|
||||
};
|
||||
bwc9876 = {
|
||||
email = "bwc9876@gmail.com";
|
||||
github = "Bwc9876";
|
||||
|
||||
@ -854,8 +854,10 @@ with lib.maintainers; {
|
||||
|
||||
r = {
|
||||
members = [
|
||||
b-rodrigues
|
||||
bcdarwin
|
||||
jbedo
|
||||
kupac
|
||||
];
|
||||
scope = "Maintain the R programming language and related packages.";
|
||||
shortName = "R";
|
||||
|
||||
@ -92,6 +92,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
|
||||
- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.
|
||||
|
||||
- [clatd](https://github.com/toreanderson/clatd), a a CLAT / SIIT-DC Edge Relay implementation for Linux.
|
||||
|
||||
- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable)
|
||||
|
||||
- [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable).
|
||||
|
||||
@ -946,6 +946,7 @@
|
||||
./services/networking/charybdis.nix
|
||||
./services/networking/chisel-server.nix
|
||||
./services/networking/cjdns.nix
|
||||
./services/networking/clatd.nix
|
||||
./services/networking/cloudflare-dyndns.nix
|
||||
./services/networking/cloudflared.nix
|
||||
./services/networking/cntlm.nix
|
||||
|
||||
@ -18,6 +18,8 @@ let
|
||||
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
|
||||
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
|
||||
|
||||
gitlabVersionAtLeast = version: lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) version;
|
||||
|
||||
databaseConfig = let
|
||||
val = {
|
||||
adapter = "postgresql";
|
||||
@ -27,10 +29,16 @@ let
|
||||
encoding = "utf8";
|
||||
pool = cfg.databasePool;
|
||||
} // cfg.extraDatabaseConfig;
|
||||
in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then {
|
||||
production.main = val;
|
||||
} else {
|
||||
production = val;
|
||||
in {
|
||||
production = (
|
||||
if (gitlabVersionAtLeast "15.0")
|
||||
then { main = val; }
|
||||
else val
|
||||
) // lib.optionalAttrs (gitlabVersionAtLeast "15.9") {
|
||||
ci = val // {
|
||||
database_tasks = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# We only want to create a database if we're actually going to connect to it.
|
||||
@ -1168,7 +1176,7 @@ in {
|
||||
set -eu
|
||||
|
||||
PSQL() {
|
||||
psql --port=${toString pgsql.port} "$@"
|
||||
psql --port=${toString pgsql.settings.port} "$@"
|
||||
}
|
||||
|
||||
PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'
|
||||
@ -1348,7 +1356,7 @@ in {
|
||||
|
||||
rm -f '${cfg.statePath}/config/database.yml'
|
||||
|
||||
${if cfg.databasePasswordFile != null then ''
|
||||
${lib.optionalString (cfg.databasePasswordFile != null) ''
|
||||
db_password="$(<'${cfg.databasePasswordFile}')"
|
||||
export db_password
|
||||
|
||||
@ -1356,16 +1364,24 @@ in {
|
||||
>&2 echo "Database password was an empty string!"
|
||||
exit 1
|
||||
fi
|
||||
''}
|
||||
|
||||
jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
|
||||
'.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \
|
||||
>'${cfg.statePath}/config/database.yml'
|
||||
''
|
||||
else ''
|
||||
jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \
|
||||
>'${cfg.statePath}/config/database.yml'
|
||||
''
|
||||
}
|
||||
# GitLab expects the `production.main` section to be the first entry in the file.
|
||||
jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} '{
|
||||
production: [
|
||||
${lib.optionalString (cfg.databasePasswordFile != null) (
|
||||
builtins.concatStringsSep "\n " (
|
||||
[ ".production${lib.optionalString (gitlabVersionAtLeast "15.0") ".main"}.password = $ENV.db_password" ]
|
||||
++ lib.optional (gitlabVersionAtLeast "15.9") "| .production.ci.password = $ENV.db_password"
|
||||
++ [ "|" ]
|
||||
)
|
||||
)} .production
|
||||
| to_entries[]
|
||||
]
|
||||
| sort_by(.key)
|
||||
| reverse
|
||||
| from_entries
|
||||
}' >'${cfg.statePath}/config/database.yml'
|
||||
|
||||
${utils.genJqSecretsReplacementSnippet
|
||||
gitlabConfig
|
||||
|
||||
82
nixos/modules/services/networking/clatd.nix
Normal file
82
nixos/modules/services/networking/clatd.nix
Normal file
@ -0,0 +1,82 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.clatd;
|
||||
|
||||
settingsFormat = pkgs.formats.keyValue {};
|
||||
|
||||
configFile = settingsFormat.generate "clatd.conf" cfg.settings;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.clatd = {
|
||||
enable = mkEnableOption "clatd";
|
||||
|
||||
package = mkPackageOption pkgs "clatd" { };
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule ({ name, ... }: {
|
||||
freeformType = settingsFormat.type;
|
||||
});
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
plat-prefix = "64:ff9b::/96";
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Configuration of clatd. See [clatd Documentation](https://github.com/toreanderson/clatd/blob/master/README.pod#configuration).
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.clatd = {
|
||||
description = "464XLAT CLAT daemon";
|
||||
documentation = [ "man:clatd(8)" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
startLimitIntervalSec = 0;
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/clatd -c ${configFile}";
|
||||
startLimitIntervalSec = 0;
|
||||
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_NET_ADMIN"
|
||||
];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_NETLINK"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@network-io"
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -51,7 +51,7 @@ in
|
||||
package = mkPackageOption pkgs "trust-dns" {
|
||||
extraDescription = ''
|
||||
::: {.note}
|
||||
The package must provide `meta.mainProgram` which names the server binayr; any other utilities (client, resolver) are not needed.
|
||||
The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
@ -86,7 +86,7 @@ in
|
||||
type = types.listOf types.str;
|
||||
default = [ "0.0.0.0" ];
|
||||
description = ''
|
||||
List of ipv4 addresses on which to listen for DNS queries.
|
||||
List of ipv4 addresses on which to listen for DNS queries.
|
||||
'';
|
||||
};
|
||||
listen_addrs_ipv6 = mkOption {
|
||||
@ -114,7 +114,7 @@ in
|
||||
};
|
||||
zones = mkOption {
|
||||
description = "List of zones to serve.";
|
||||
default = {};
|
||||
default = [];
|
||||
type = types.listOf (types.coercedTo types.str (zone: { inherit zone; }) zoneType);
|
||||
};
|
||||
};
|
||||
|
||||
@ -6,7 +6,6 @@ let
|
||||
concatMap
|
||||
concatMapStrings
|
||||
concatStrings
|
||||
concatStringsSep
|
||||
escapeShellArg
|
||||
flip
|
||||
foldr
|
||||
@ -491,10 +490,10 @@ in
|
||||
|
||||
theme = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
example = literalExpression "pkgs.nixos-grub2-theme";
|
||||
example = literalExpression ''"''${pkgs.libsForQt5.breeze-grub}/grub/themes/breeze"'';
|
||||
default = null;
|
||||
description = ''
|
||||
Grub theme to be used.
|
||||
Path to the grub theme to be used.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -219,6 +219,11 @@ in
|
||||
systemd.services.podman.environment = config.networking.proxy.envVars;
|
||||
systemd.sockets.podman.wantedBy = [ "sockets.target" ];
|
||||
systemd.sockets.podman.socketConfig.SocketGroup = "podman";
|
||||
# Podman does not support multiple sockets, as of podman 5.0.2, so we use
|
||||
# a symlink. Unfortunately this does not let us use an alternate group,
|
||||
# such as `docker`.
|
||||
systemd.sockets.podman.socketConfig.Symlinks =
|
||||
lib.mkIf cfg.dockerSocket.enable [ "/run/docker.sock" ];
|
||||
|
||||
systemd.user.services.podman.environment = config.networking.proxy.envVars;
|
||||
systemd.user.sockets.podman.wantedBy = [ "sockets.target" ];
|
||||
@ -239,11 +244,6 @@ in
|
||||
'')
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
lib.optionals cfg.dockerSocket.enable [
|
||||
"L! /run/docker.sock - - - - /run/podman/podman.sock"
|
||||
];
|
||||
|
||||
users.groups.podman = { };
|
||||
|
||||
assertions = [
|
||||
|
||||
@ -193,6 +193,7 @@ in {
|
||||
cinnamon = handleTest ./cinnamon.nix {};
|
||||
cinnamon-wayland = handleTest ./cinnamon-wayland.nix {};
|
||||
cjdns = handleTest ./cjdns.nix {};
|
||||
clatd = handleTest ./clatd.nix {};
|
||||
clickhouse = handleTest ./clickhouse.nix {};
|
||||
cloud-init = handleTest ./cloud-init.nix {};
|
||||
cloud-init-hostname = handleTest ./cloud-init-hostname.nix {};
|
||||
|
||||
189
nixos/tests/clatd.nix
Normal file
189
nixos/tests/clatd.nix
Normal file
@ -0,0 +1,189 @@
|
||||
# This test verifies that we can ping an IPv4-only server from an IPv6-only
|
||||
# client via a NAT64 router using CLAT on the client. The hosts and networks
|
||||
# are configured as follows:
|
||||
#
|
||||
# +------
|
||||
# Client | clat Address: 192.0.0.1/32 (configured via clatd)
|
||||
# | Route: default
|
||||
# |
|
||||
# | eth1 Address: 2001:db8::2/64
|
||||
# | | Route: default via 2001:db8::1
|
||||
# +--|---
|
||||
# | VLAN 3
|
||||
# +--|---
|
||||
# | eth2 Address: 2001:db8::1/64
|
||||
# Router |
|
||||
# | nat64 Address: 64:ff9b::1/128
|
||||
# | Route: 64:ff9b::/96
|
||||
# | Address: 192.0.2.0/32
|
||||
# | Route: 192.0.2.0/24
|
||||
# |
|
||||
# | eth1 Address: 100.64.0.1/24
|
||||
# +--|---
|
||||
# | VLAN 2
|
||||
# +--|---
|
||||
# Server | eth1 Address: 100.64.0.2/24
|
||||
# | Route: 192.0.2.0/24 via 100.64.0.1
|
||||
# +------
|
||||
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "clatd";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ hax404 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
# The server is configured with static IPv4 addresses. RFC 6052 Section 3.1
|
||||
# disallows the mapping of non-global IPv4 addresses like RFC 1918 into the
|
||||
# Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of
|
||||
# documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from
|
||||
# RFC 6589 (Carrier Grade NAT) is used here.
|
||||
# To reach the IPv4 address pool of the NAT64 gateway, there is a static
|
||||
# route configured. In normal cases, where the router would also source NAT
|
||||
# the pool addresses to one IPv4 addresses, this would not be needed.
|
||||
server = {
|
||||
virtualisation.vlans = [
|
||||
2 # towards router
|
||||
];
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
interfaces.eth1 = lib.mkForce {};
|
||||
};
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
networks."vlan1" = {
|
||||
matchConfig.Name = "eth1";
|
||||
address = [
|
||||
"100.64.0.2/24"
|
||||
];
|
||||
routes = [
|
||||
{ routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; }
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# The router is configured with static IPv4 addresses towards the server
|
||||
# and IPv6 addresses towards the client. For NAT64, the Well-Known prefix
|
||||
# 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the
|
||||
# tun-interface nat64 and does the translation over it. The IPv6 packets
|
||||
# are sent to this interfaces and received as IPv4 packets and vice versa.
|
||||
# As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it
|
||||
# needs a pool of IPv4 addresses which must be at least as big as the
|
||||
# expected amount of clients. In this test, the packets from the pool are
|
||||
# directly routed towards the client. In normal cases, there would be a
|
||||
# second source NAT44 to map all clients behind one IPv4 address.
|
||||
router = {
|
||||
boot.kernel.sysctl = {
|
||||
"net.ipv4.ip_forward" = 1;
|
||||
"net.ipv6.conf.all.forwarding" = 1;
|
||||
};
|
||||
|
||||
virtualisation.vlans = [
|
||||
2 # towards server
|
||||
3 # towards client
|
||||
];
|
||||
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = true;
|
||||
firewall.enable = false;
|
||||
interfaces.eth1 = lib.mkForce {
|
||||
ipv4 = {
|
||||
addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ];
|
||||
};
|
||||
};
|
||||
interfaces.eth2 = lib.mkForce {
|
||||
ipv6 = {
|
||||
addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.tayga = {
|
||||
enable = true;
|
||||
ipv4 = {
|
||||
address = "192.0.2.0";
|
||||
router = {
|
||||
address = "192.0.2.1";
|
||||
};
|
||||
pool = {
|
||||
address = "192.0.2.0";
|
||||
prefixLength = 24;
|
||||
};
|
||||
};
|
||||
ipv6 = {
|
||||
address = "2001:db8::1";
|
||||
router = {
|
||||
address = "64:ff9b::1";
|
||||
};
|
||||
pool = {
|
||||
address = "64:ff9b::";
|
||||
prefixLength = 96;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# The client is configured with static IPv6 addresses. It has also a static
|
||||
# default route towards the router. To reach the IPv4-only server, the
|
||||
# client starts the clat daemon which starts and configures the local
|
||||
# IPv4 -> IPv6 translation via Tayga.
|
||||
client = {
|
||||
virtualisation.vlans = [
|
||||
3 # towards router
|
||||
];
|
||||
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
interfaces.eth1 = lib.mkForce {};
|
||||
};
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
networks."vlan1" = {
|
||||
matchConfig.Name = "eth1";
|
||||
address = [
|
||||
"2001:db8::2/64"
|
||||
];
|
||||
routes = [
|
||||
{ routeConfig = { Destination = "::/0"; Gateway = "2001:db8::1"; }; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.clatd = {
|
||||
enable = true;
|
||||
settings.plat-prefix = "64:ff9b::/96";
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.mtr ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
# wait for all machines to start up
|
||||
for machine in client, router, server:
|
||||
machine.wait_for_unit("network-online.target")
|
||||
|
||||
with subtest("Wait for tayga and clatd"):
|
||||
router.wait_for_unit("tayga.service")
|
||||
client.wait_for_unit("clatd.service")
|
||||
# clatd checks if this system has IPv4 connectivity for 10 seconds
|
||||
client.wait_until_succeeds(
|
||||
'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"'
|
||||
)
|
||||
|
||||
with subtest("Test ICMP"):
|
||||
client.wait_until_succeeds("ping -c 3 100.64.0.2 >&2")
|
||||
|
||||
with subtest("Test ICMP and show a traceroute"):
|
||||
client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2")
|
||||
|
||||
client.log(client.execute("systemd-analyze security clatd.service")[1])
|
||||
'';
|
||||
})
|
||||
@ -1,42 +0,0 @@
|
||||
Shows build and link errors in configure for ease of debugging which
|
||||
options require what.
|
||||
diff --git a/scripts/checks.sh b/scripts/checks.sh
|
||||
index 64cbbf3..fab4d9b 100644
|
||||
--- a/scripts/checks.sh
|
||||
+++ b/scripts/checks.sh
|
||||
@@ -425,7 +425,7 @@ try_compile()
|
||||
echo "$1" > $__src || exit 1
|
||||
shift
|
||||
__cmd="$CC -c $CFLAGS $@ $__src -o $__obj"
|
||||
- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null
|
||||
+ $CC -c $CFLAGS "$@" $__src -o $__obj
|
||||
;;
|
||||
cxx)
|
||||
__src=`tmp_file prog.cc`
|
||||
@@ -433,7 +433,7 @@ try_compile()
|
||||
echo "$1" > $__src || exit 1
|
||||
shift
|
||||
__cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj"
|
||||
- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null
|
||||
+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj
|
||||
;;
|
||||
esac
|
||||
return $?
|
||||
@@ -451,7 +451,7 @@ try_compile_link()
|
||||
echo "$1" > $__src || exit 1
|
||||
shift
|
||||
__cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@"
|
||||
- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null
|
||||
+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@"
|
||||
;;
|
||||
cxx)
|
||||
__src=`tmp_file prog.cc`
|
||||
@@ -459,7 +459,7 @@ try_compile_link()
|
||||
echo "$1" > $__src || exit 1
|
||||
shift
|
||||
__cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@"
|
||||
- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null
|
||||
+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@"
|
||||
;;
|
||||
esac
|
||||
return $?
|
||||
@ -250,6 +250,7 @@ stdenv.mkDerivation rec {
|
||||
# no-derivatives clause
|
||||
license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ];
|
||||
maintainers = with maintainers; [ nathyong jpotier ddelabru ];
|
||||
mainProgram = "Rack";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
|
||||
version = "0.29.2";
|
||||
version = "0.29.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoin-ABC";
|
||||
repo = "bitcoin-abc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-og9hMQdDXGdUQN+A+z0064E6svF+qPd9CWtDQsdvNYQ=";
|
||||
hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
@ -970,7 +970,7 @@ let
|
||||
version = "0.8.25";
|
||||
}
|
||||
// sources.${stdenv.system};
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
meta = {
|
||||
description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE";
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, callPackage
|
||||
, patchelf
|
||||
, unzip
|
||||
, poco
|
||||
, openssl
|
||||
, SDL2
|
||||
@ -16,18 +14,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
craftos2-lua = fetchFromGitHub {
|
||||
owner = "MCJack123";
|
||||
repo = "craftos2-lua";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8bl83AOIWtUQ06F2unYEF08VT13o9EGo9YDZpdNxd8w=";
|
||||
hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY=";
|
||||
};
|
||||
craftos2-rom = fetchFromGitHub {
|
||||
owner = "McJack123";
|
||||
repo = "craftos2-rom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aCRJ3idSrRM8ydt8hP8nA1RR0etPnWpQKphXcOGgTfk=";
|
||||
hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw=";
|
||||
};
|
||||
in
|
||||
|
||||
@ -39,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "MCJack123";
|
||||
repo = "craftos2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iQCv4EDdqmnU0fYxMwpCZ2Z5p43P0MGBNIG/dZrWndg=";
|
||||
hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw=";
|
||||
};
|
||||
|
||||
buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "urlscan";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecat53";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-OzcoOIgEiadWrsUPIxBJTuZQYjScJBYKyqCu1or6fz8=";
|
||||
hash = "sha256-nyq4BrpfbZwK/nOnB8ZEN1wlM8CssYVRvV7ytpX7k40=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -14,22 +14,22 @@
|
||||
let
|
||||
package = buildGoModule rec {
|
||||
pname = "opentofu";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentofu";
|
||||
repo = "opentofu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho=";
|
||||
hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk=";
|
||||
vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
|
||||
ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
|
||||
|
||||
postConfigure = ''
|
||||
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
|
||||
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
|
||||
--replace "/bin/stty" "${coreutils}/bin/stty"
|
||||
--replace-fail "/bin/stty" "${coreutils}/bin/stty"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -1,40 +1,27 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }:
|
||||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "clockify";
|
||||
version = "2.1.6";
|
||||
version = "2.1.17.1354";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb";
|
||||
hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ=";
|
||||
url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage";
|
||||
hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
extraInstallCommands =
|
||||
let appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in ''
|
||||
mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
|
||||
dontBuild = true;
|
||||
dontConfigure = true;
|
||||
install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications
|
||||
install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mv usr $out
|
||||
mv opt $out
|
||||
|
||||
substituteInPlace $out/share/applications/clockify.desktop \
|
||||
--replace "/opt/Clockify/" ""
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/clockify \
|
||||
--add-flags $out/opt/Clockify/resources/app.asar
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
substituteInPlace $out/share/applications/clockify.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free time tracker and timesheet app that lets you track work hours across projects";
|
||||
|
||||
@ -58,6 +58,10 @@ let
|
||||
# may wish to wrap GR without python support.
|
||||
pythonPkgs = extraPythonPackages
|
||||
++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ]
|
||||
++ unwrapped.passthru.uhd.pythonPath
|
||||
++ lib.optionals (unwrapped.passthru.uhd.pythonPath != []) [
|
||||
(unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd)
|
||||
]
|
||||
# Add the extraPackages as python modules as well
|
||||
++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)
|
||||
++ lib.flatten (lib.mapAttrsToList (
|
||||
|
||||
@ -8,15 +8,8 @@
|
||||
, boost
|
||||
, ncurses
|
||||
, enableCApi ? true
|
||||
# Although we handle the Python API's dependencies in pythonEnvArg, this
|
||||
# feature is currently disabled as upstream attempts to run `python setup.py
|
||||
# install` by itself, and it fails because the Python's environment's prefix is
|
||||
# not a writable directly. Adding support for this feature would require using
|
||||
# python's pypa/build nad pypa/install hooks directly, and currently it is hard
|
||||
# to do that because it all happens after a long buildPhase of the C API.
|
||||
, enablePythonApi ? false
|
||||
, enablePythonApi ? true
|
||||
, python3
|
||||
, buildPackages
|
||||
, enableExamples ? false
|
||||
, enableUtils ? true
|
||||
, libusb1
|
||||
@ -38,13 +31,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
onOffBool = b: if b then "ON" else "OFF";
|
||||
inherit (lib) optionals;
|
||||
# Later used in pythonEnv generation. Python + mako are always required for the build itself but not necessary for runtime.
|
||||
pythonEnvArg = (ps: with ps; [ mako ]
|
||||
++ optionals (enablePythonApi) [ numpy setuptools ]
|
||||
++ optionals (enableUtils) [ requests six ]
|
||||
);
|
||||
inherit (lib) optionals cmakeBool;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -72,7 +59,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# hash.
|
||||
sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3";
|
||||
};
|
||||
# This are the minimum required Python dependencies, this attribute might
|
||||
# be useful if you want to build a development environment with a python
|
||||
# interpreter able to import the uhd module.
|
||||
pythonPath = optionals (enablePythonApi || enableUtils) [
|
||||
python3.pkgs.numpy
|
||||
python3.pkgs.setuptools
|
||||
] ++ optionals (enableUtils) [
|
||||
python3.pkgs.requests
|
||||
python3.pkgs.six
|
||||
|
||||
/* These deps are needed for the usrp_hwd.py utility, however even if they
|
||||
would have been added here, the utility wouldn't have worked because it
|
||||
depends on an old python library mprpc that is not supported for Python >
|
||||
3.8. See also report upstream:
|
||||
https://github.com/EttusResearch/uhd/issues/744
|
||||
|
||||
python3.pkgs.gevent
|
||||
python3.pkgs.pyudev
|
||||
python3.pkgs.pyroute2
|
||||
|
||||
*/
|
||||
];
|
||||
passthru = {
|
||||
runtimePython = python3.withPackages (ps: finalAttrs.pythonPath);
|
||||
updateScript = [
|
||||
./update.sh
|
||||
# Pass it this file name as argument
|
||||
@ -83,66 +93,91 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
"-DENABLE_LIBUHD=ON"
|
||||
"-DENABLE_USB=ON"
|
||||
"-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases
|
||||
"-DENABLE_EXAMPLES=${onOffBool enableExamples}"
|
||||
"-DENABLE_UTILS=${onOffBool enableUtils}"
|
||||
"-DENABLE_C_API=${onOffBool enableCApi}"
|
||||
"-DENABLE_PYTHON_API=${onOffBool enablePythonApi}"
|
||||
"-DENABLE_DPDK=${onOffBool enableDpdk}"
|
||||
# Regardless of doCheck, we want to build the tests to help us gain
|
||||
# confident that the package is OK.
|
||||
"-DENABLE_TESTS=ON"
|
||||
(cmakeBool "ENABLE_EXAMPLES" enableExamples)
|
||||
(cmakeBool "ENABLE_UTILS" enableUtils)
|
||||
(cmakeBool "ENABLE_C_API" enableCApi)
|
||||
(cmakeBool "ENABLE_PYTHON_API" enablePythonApi)
|
||||
/*
|
||||
|
||||
Otherwise python tests fail. Using a dedicated pythonEnv for either or both
|
||||
nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to
|
||||
install the Python API as reported on our end at [1] (we don't want
|
||||
upstream to think we are in a virtual environment because we use
|
||||
python3.withPackages...).
|
||||
|
||||
Putting simply the python dependencies in the nativeBuildInputs and
|
||||
buildInputs as they are now from some reason makes the `python` in the
|
||||
checkPhase fail to find the python dependencies, as reported at [2]. Even
|
||||
using nativeCheckInputs with the python dependencies, or using a
|
||||
`python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the
|
||||
`python` found in $PATH first is the one from nativeBuildInputs.
|
||||
|
||||
[1]: https://github.com/NixOS/nixpkgs/pull/307435
|
||||
[2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/
|
||||
|
||||
Hence we use upstream's provided cmake flag to control which python
|
||||
interpreter they will use to run the the python tests.
|
||||
|
||||
*/
|
||||
"-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}"
|
||||
(cmakeBool "ENABLE_DPDK" enableDpdk)
|
||||
# Devices
|
||||
"-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}"
|
||||
"-DENABLE_MPMD=${onOffBool enableMpmd}"
|
||||
"-DENABLE_B100=${onOffBool enableB100}"
|
||||
"-DENABLE_B200=${onOffBool enableB200}"
|
||||
"-DENABLE_USRP1=${onOffBool enableUsrp1}"
|
||||
"-DENABLE_USRP2=${onOffBool enableUsrp2}"
|
||||
"-DENABLE_X300=${onOffBool enableX300}"
|
||||
"-DENABLE_N300=${onOffBool enableN300}"
|
||||
"-DENABLE_N320=${onOffBool enableN320}"
|
||||
"-DENABLE_E300=${onOffBool enableE300}"
|
||||
"-DENABLE_E320=${onOffBool enableE320}"
|
||||
]
|
||||
(cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock)
|
||||
(cmakeBool "ENABLE_MPMD" enableMpmd)
|
||||
(cmakeBool "ENABLE_B100" enableB100)
|
||||
(cmakeBool "ENABLE_B200" enableB200)
|
||||
(cmakeBool "ENABLE_USRP1" enableUsrp1)
|
||||
(cmakeBool "ENABLE_USRP2" enableUsrp2)
|
||||
(cmakeBool "ENABLE_X300" enableX300)
|
||||
(cmakeBool "ENABLE_N300" enableN300)
|
||||
(cmakeBool "ENABLE_N320" enableN320)
|
||||
(cmakeBool "ENABLE_E300" enableE300)
|
||||
(cmakeBool "ENABLE_E320" enableE320)
|
||||
# TODO: Check if this still needed
|
||||
# ABI differences GCC 7.1
|
||||
# /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
|
||||
++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
|
||||
;
|
||||
|
||||
pythonEnv = python3.withPackages pythonEnvArg;
|
||||
] ++ optionals stdenv.isAarch32 [
|
||||
"-DCMAKE_CXX_FLAGS=-Wno-psabi"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
# Present both here and in buildInputs for cross compilation.
|
||||
(buildPackages.python3.withPackages pythonEnvArg)
|
||||
python3
|
||||
python3.pkgs.mako
|
||||
# We add this unconditionally, but actually run wrapPythonPrograms only if
|
||||
# python utilities are enabled
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
buildInputs = [
|
||||
buildInputs = finalAttrs.pythonPath ++ [
|
||||
boost
|
||||
libusb1
|
||||
]
|
||||
# However, if enableLibuhd_Python_api *or* enableUtils is on, we need
|
||||
# pythonEnv for runtime as well. The utilities' runtime dependencies are
|
||||
# handled at the environment
|
||||
++ optionals (enableExamples) [ ncurses ncurses.dev ]
|
||||
++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ]
|
||||
++ optionals (enableDpdk) [ dpdk ]
|
||||
;
|
||||
] ++ optionals (enableExamples) [
|
||||
ncurses ncurses.dev
|
||||
] ++ optionals (enableDpdk) [
|
||||
dpdk
|
||||
];
|
||||
|
||||
# many tests fails on darwin, according to ofborg
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# Build only the host software
|
||||
preConfigure = "cd host";
|
||||
# TODO: Check if this still needed, perhaps relevant:
|
||||
# https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm
|
||||
patches = [
|
||||
# Disable tests that fail in the sandbox
|
||||
# Disable tests that fail in the sandbox, last checked at version 4.6.0.0
|
||||
./no-adapter-tests.patch
|
||||
];
|
||||
|
||||
postPhases = [ "installFirmware" "removeInstalledTests" ]
|
||||
++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ]
|
||||
;
|
||||
postPhases = [
|
||||
"installFirmware"
|
||||
"removeInstalledTests"
|
||||
] ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [
|
||||
"moveUdevRules"
|
||||
];
|
||||
|
||||
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
|
||||
installFirmware = ''
|
||||
@ -162,6 +197,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/
|
||||
'';
|
||||
|
||||
# Wrap the python utilities with our pythonPath definition
|
||||
postFixup = lib.optionalString (enablePythonApi && enableUtils) ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
disallowedReferences = optionals (!enablePythonApi && !enableUtils) [
|
||||
python3
|
||||
];
|
||||
|
||||
@ -3,17 +3,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "digital";
|
||||
pkgDescription = "A digital logic designer and circuit simulator.";
|
||||
version = "0.30";
|
||||
buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
type = "Application";
|
||||
name = "Digital";
|
||||
desktopName = pkgDescription;
|
||||
name = pname;
|
||||
desktopName = "Digital";
|
||||
comment = "Easy-to-use digital logic designer and circuit simulator";
|
||||
exec = "digital";
|
||||
icon = "digital";
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
categories = [ "Education" "Electronics" ];
|
||||
mimeTypes = [ "text/x-digital" ];
|
||||
terminal = false;
|
||||
@ -28,8 +29,7 @@ let
|
||||
mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}";
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "digital";
|
||||
inherit version jre;
|
||||
inherit pname version jre;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hneemann";
|
||||
@ -44,6 +44,8 @@ maven.buildMavenPackage rec {
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/java
|
||||
|
||||
@ -53,6 +55,13 @@ maven.buildMavenPackage rec {
|
||||
makeWrapper ${jre}/bin/java $out/bin/${pname} \
|
||||
--add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \
|
||||
--add-flags "-jar $out/share/java/Digital.jar"
|
||||
|
||||
install -Dm644 src/main/svg/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
|
||||
for size in 16 32 48 64 128; do
|
||||
install -Dm644 src/main/resources/icons/icon"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
|
||||
index 7794c9edc3..1753277b1f 100644
|
||||
--- a/src/sage/libs/linbox/conversion.pxd
|
||||
+++ b/src/sage/libs/linbox/conversion.pxd
|
||||
@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
|
||||
- v -- linbox vector
|
||||
"""
|
||||
cdef Vector_integer_dense res = P()
|
||||
- cdef cppvector[Integer] * vec = &v.refRep()
|
||||
cdef size_t i
|
||||
for i in range(<size_t> res._degree):
|
||||
- mpz_set(res._entries[i], vec[0][i].get_mpz_const())
|
||||
+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
|
||||
|
||||
return res
|
||||
diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
|
||||
index 9112d151f8..dcc482960c 100644
|
||||
--- a/src/sage/libs/linbox/linbox.pxd
|
||||
+++ b/src/sage/libs/linbox/linbox.pxd
|
||||
@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
||||
ctypedef Modular_double Field
|
||||
ctypedef double Element
|
||||
DenseMatrix_Modular_double(Field F, size_t m, size_t n)
|
||||
- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
|
||||
+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*)
|
||||
void setEntry(size_t i, size_t j, Element& a)
|
||||
Element &getEntry(size_t i, size_t j)
|
||||
|
||||
@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
||||
ctypedef Modular_float Field
|
||||
ctypedef float Element
|
||||
DenseMatrix_Modular_float(Field F, size_t m, size_t n)
|
||||
- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
|
||||
+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*)
|
||||
void setEntry(size_t i, size_t j, Element& a)
|
||||
Element &getEntry(size_t i, size_t j)
|
||||
|
||||
@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h":
|
||||
DenseVector_integer (Field &F)
|
||||
DenseVector_integer (Field &F, long& m)
|
||||
DenseVector_integer (Field &F, cppvector[Integer]&)
|
||||
- cppvector[Element]& refRep()
|
||||
size_t size()
|
||||
void resize(size_t)
|
||||
void resize(size_t n, const Element&)
|
||||
diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
index 010365d76f..3d60726ff9 100644
|
||||
--- a/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
+++ b/src/sage/matrix/matrix_modn_dense_template.pxi
|
||||
@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
|
||||
return 0,[]
|
||||
|
||||
cdef ModField *F = new ModField(<long>modulus)
|
||||
- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
|
||||
+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries)
|
||||
cdef Py_ssize_t r = reducedRowEchelonize(A[0])
|
||||
cdef Py_ssize_t i,j
|
||||
for i in range(nrows):
|
||||
@ -1,75 +0,0 @@
|
||||
diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc
|
||||
--- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200
|
||||
+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100
|
||||
@@ -3448,7 +3448,7 @@
|
||||
std::find_if(
|
||||
d_visible_boundary_section_seq.begin(),
|
||||
d_visible_boundary_section_seq.end(),
|
||||
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
|
||||
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
|
||||
boost::cref(section_index));
|
||||
|
||||
if (visible_section_iter == d_visible_boundary_section_seq.end())
|
||||
@@ -3467,7 +3467,7 @@
|
||||
std::find_if(
|
||||
d_visible_interior_section_seq.begin(),
|
||||
d_visible_interior_section_seq.end(),
|
||||
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
|
||||
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
|
||||
boost::cref(section_index));
|
||||
|
||||
if (visible_section_iter == d_visible_interior_section_seq.end())
|
||||
diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc
|
||||
--- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200
|
||||
+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100
|
||||
@@ -274,7 +274,7 @@
|
||||
GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params(
|
||||
const ReconstructVisualLayerParams ¶ms)
|
||||
{
|
||||
- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2);
|
||||
+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2);
|
||||
d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error();
|
||||
d_render_params.fill_polygons = params.get_fill_polygons();
|
||||
d_render_params.fill_polylines = params.get_fill_polylines();
|
||||
diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc
|
||||
--- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200
|
||||
+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100
|
||||
@@ -448,7 +448,7 @@
|
||||
&GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create,
|
||||
boost::bind(
|
||||
&ReconstructScalarCoverageVisualLayerParams::create,
|
||||
- _1),
|
||||
+ boost::placeholders::_1),
|
||||
true);
|
||||
|
||||
registry.register_visual_layer_type(
|
||||
@@ -498,7 +498,7 @@
|
||||
// NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from
|
||||
// ViewportWindow, because ViewportWindow is not yet available (a reference to
|
||||
// it not yet been initialised inside ViewState) so accessing it would crash...
|
||||
- _1, boost::ref(view_state)),
|
||||
+ boost::placeholders::_1, boost::ref(view_state)),
|
||||
true);
|
||||
|
||||
// DERIVED_DATA group.
|
||||
@@ -549,7 +549,7 @@
|
||||
&GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create,
|
||||
boost::bind(
|
||||
&VelocityFieldCalculatorVisualLayerParams::create,
|
||||
- _1, boost::cref(view_state.get_rendered_geometry_parameters())),
|
||||
+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())),
|
||||
true);
|
||||
|
||||
using namespace GPlatesUtils;
|
||||
diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc
|
||||
--- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200
|
||||
+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100
|
||||
@@ -326,7 +326,7 @@
|
||||
*d_geometry_operation_state_ptr,
|
||||
*d_modify_geometry_state,
|
||||
*d_measure_distance_state_ptr,
|
||||
- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1),
|
||||
+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1),
|
||||
get_view_state(),
|
||||
*this);
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
index ca353c4099..499be0a986 100644
|
||||
--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
||||
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
||||
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
||||
// the alternative stack. Ensure that the size of the alternative stack is
|
||||
// large enough.
|
||||
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||||
+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
|
||||
|
||||
// Only set an alternative stack if there isn't already one, or if the current
|
||||
// one is too small.
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tym";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "endaaman";
|
||||
repo = "${pname}";
|
||||
rev = version;
|
||||
sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA=";
|
||||
sha256 = "sha256-53XAHyDiFPUTmw/rgoEoSoh+c/t4rS12gxwH1yKHqvw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,17 +1,22 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-vanity-hash";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prasmussen";
|
||||
repo = "git-vanity-hash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jD8cSFXf9UNBZ9d8JTnuwhs6nPHY/xGd5RyqF+mQOlo=";
|
||||
# v1.0.0 + build fix
|
||||
rev = "a80e7725ac6d0b7e6807cd7315cfdc7eaf0584f6";
|
||||
hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8oW6gRtdQdmSmdwKlcU2EhHsyhk9hFhKl7RtsYwC7Ps=";
|
||||
cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/doc/git-vanity-hash
|
||||
|
||||
@ -7,20 +7,30 @@
|
||||
, mesa
|
||||
, pango
|
||||
, udev
|
||||
, shaderc
|
||||
, libglvnd
|
||||
, vulkan-loader
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jay";
|
||||
version = "unstable-2022-11-20";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mahkoh";
|
||||
repo = pname;
|
||||
rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2";
|
||||
sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9fWwVUqeYADt33HGaJRRFmM20WM7qRWbNGpt3rk9xQM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU=";
|
||||
cargoSha256 = "sha256-oPGY/rVx94BkWgKkwwyDjfASMyGGU32R5IZuNjOv+EM=";
|
||||
|
||||
SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
@ -29,9 +39,18 @@ rustPlatform.buildRustPackage rec {
|
||||
pango
|
||||
udev
|
||||
libinput
|
||||
shaderc
|
||||
];
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
runtimeDependencies = [
|
||||
libglvnd
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal
|
||||
install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Wayland compositor written in Rust";
|
||||
|
||||
64
pkgs/by-name/ax/ax25ms/package.nix
Normal file
64
pkgs/by-name/ax/ax25ms/package.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoconf
|
||||
, protobuf
|
||||
, pkg-config
|
||||
, grpc
|
||||
, libtool
|
||||
, which
|
||||
, automake
|
||||
, libax25
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ax25ms";
|
||||
version = "0-unstable-2024-04-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThomasHabets";
|
||||
repo = "ax25ms";
|
||||
rev = "c7d7213bb182e4b60f655c3f9f1bcb2b2440406b";
|
||||
hash = "sha256-GljGJa44topJ6T0g5wuU8GTHLKzNmQqUl8/AR+pw2+I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
protobuf
|
||||
grpc
|
||||
libax25
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
pkg-config
|
||||
autoconf
|
||||
libtool
|
||||
automake
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs scripts
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
set +e
|
||||
for binary_path in "$out/bin"/*; do
|
||||
filename=$(basename "$binary_path")
|
||||
mv "$binary_path" "$out/bin/ax25ms-$filename"
|
||||
done
|
||||
set -e
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of AX.25 microservices, designed to be pluggable for any implementation";
|
||||
homepage = "https://github.com/ThomasHabets/ax25ms";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
matthewcroughan
|
||||
sarcasticadmin
|
||||
pkharvey
|
||||
];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
28
pkgs/by-name/br/broom/package.nix
Normal file
28
pkgs/by-name/br/broom/package.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "broom";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "a-camarillo";
|
||||
repo = "broom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a2hUgYpiKm/dZWLRuCZKuGStmZ/7jDtLRAjd/B57Vxw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zNklqGjMt89b+JOZfKjTO6c75SXO10e7YtQOqqQZpnA=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An interactive CLI tool for managing local git branches";
|
||||
homepage = "https://github.com/a-camarillo/broom";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ a-camarillo ];
|
||||
mainProgram = "broom";
|
||||
};
|
||||
}
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "butt";
|
||||
version = "0.1.41";
|
||||
version = "1.41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-wTypjqd2PpmDSA8vScMLkAL44xE/WAccm747PS9ClVA=";
|
||||
hash = "sha256-y/XIcFm1TWVd5SL+kDCJc21CtMwipMQgRE4gPra5+98=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, tayga
|
||||
, iproute2
|
||||
, iptables
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -52,6 +53,8 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
'';
|
||||
|
||||
passthru.tests.clatd = nixosTests.clatd;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A 464XLAT CLAT implementation for Linux";
|
||||
homepage = "https://github.com/toreanderson/clatd";
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "csharpier";
|
||||
version = "0.27.2";
|
||||
version = "0.28.2";
|
||||
executables = "dotnet-csharpier";
|
||||
|
||||
nugetSha256 = "sha256-P4v4h09FuisIry9B/6batrG0CpLqnrkxnlk1yEd1JbY=";
|
||||
nugetSha256 = "sha256-fXyE25niM80pPXCLC80Hm9XEHGUMx0XZOMxdVoA0h18=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An opinionated code formatter for C#";
|
||||
|
||||
47
pkgs/by-name/dp/dps8m/package.nix
Normal file
47
pkgs/by-name/dp/dps8m/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, libuv
|
||||
, coreutils-full
|
||||
, pkg-config
|
||||
, gnugrep
|
||||
, gnused
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dps8m";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dps8m";
|
||||
repo = "dps8m";
|
||||
rev = "R${version}";
|
||||
hash = "sha256-YCDeHryxXZXOXqUXkbWwH7Vna+ljzydFXPeo2et87x8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
env = {
|
||||
ENV = "${coreutils-full}/bin/env";
|
||||
GREP = "${gnugrep}/bin/grep";
|
||||
SED = "${gnused}/bin/sed";
|
||||
PREFIX = placeholder "out";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
coreutils-full
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libuv
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "DPS8M: GE / Honeywell / Bull DPS‑8/M mainframe simulator";
|
||||
homepage = "https://gitlab.com/dps8m/dps8m";
|
||||
license = licenses.icu;
|
||||
maintainers = with maintainers; [ matthewcroughan sarcasticadmin ];
|
||||
mainProgram = "dps8m";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -5,22 +5,21 @@
|
||||
}:
|
||||
buildGo122Module rec {
|
||||
pname = "gptscript";
|
||||
version = "0.1.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gptscript-ai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zG75L10WvfkmjwW3ifBHaTkHNXqXvNO0PaXejCc2tls=";
|
||||
hash = "sha256-teZQhGYKJ5Ma5by3Wug5B1hAV1tox94MF586ZeEXp6o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LV9uLLwdtLJTIxaBB1Jew92S0QjQsceyLEfSrDeDnR4=";
|
||||
vendorHash = "sha256-0irUcEomQzo9+vFJEk28apLNuJdsX1RHEqB7T88X7Ks=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X main.Commit=${version}"
|
||||
"-X github.com/gptscript-ai/gptscript/pkg/version.Tag=v${version}"
|
||||
];
|
||||
|
||||
# Requires network access
|
||||
@ -30,8 +29,8 @@ buildGo122Module rec {
|
||||
homepage = "https://gptscript.ai";
|
||||
changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}";
|
||||
description = "Natural Language Programming";
|
||||
license = with licenses; [asl20];
|
||||
maintainers = with maintainers; [jamiemagee];
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
mainProgram = "gptscript";
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.125.4";
|
||||
version = "0.125.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oeOP9UoiAGwYR2Vzr5IZrLfYA3EQJ9j6Bzh7C12pA+c=";
|
||||
hash = "sha256-vvADd4S4AURkIODGvDf4J9omZjKcZeQKQ6ZSKDu1gog=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L8+e6rZvFaNV9gyWJtXv9NnzoigVDSyNKTuxGrRwb44=";
|
||||
|
||||
43
pkgs/by-name/ji/jikken/package.nix
Normal file
43
pkgs/by-name/ji/jikken/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
openssl,
|
||||
stdenv,
|
||||
darwin,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jikken";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jikkenio";
|
||||
repo = "jikken";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A6+sezhob7GqAzuJsJGH7ZDLTJhCD+f0t3zx/IMdPsI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FxsI2ku52MlSGUph3/ovmn6HIwW+cUwVXuwzcd/1DV4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful, source control friendly REST API testing toolkit";
|
||||
homepage = "https://jikken.io/";
|
||||
changelog = "https://github.com/jikkenio/jikken/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vinnymeller ];
|
||||
mainProgram = "jk";
|
||||
};
|
||||
}
|
||||
16
pkgs/by-name/jt/jtdx/package.nix
Normal file
16
pkgs/by-name/jt/jtdx/package.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ wsjtx, fetchgit, qt5, lib }:
|
||||
wsjtx.overrideAttrs (old: {
|
||||
name = "jtdx";
|
||||
version = "unstable-2022-03-01";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/jtdx-project/jtdx.git";
|
||||
rev = "2a0e2bea8c66c9ca94d2ea8034cf83a68cfa40eb";
|
||||
hash = "sha256-5KlFBlzG3hKFFGO37c+VN+FvZKSnTQXvSorB+Grns8w=";
|
||||
};
|
||||
buildInputs = old.buildInputs ++ [ qt5.qtwebsockets ];
|
||||
meta = {
|
||||
description = "wsjtx fork with some extra features";
|
||||
maintainers = with lib.maintainers; [ matthewcroughan sarcasticadmin pkharvey ];
|
||||
homepage = "https://github.com/jtdx-project/jtdx";
|
||||
};
|
||||
})
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kcl-cli";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kcl-lang";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A98Y5ktXFwn1XrFTwL8l04VW5zPNcMLtZCUf+niXx6c=";
|
||||
hash = "sha256-OKRMgxynKmHnO+5tcKlispFkpQehHINzB6qphH+lwHQ=";
|
||||
};
|
||||
vendorHash = "sha256-zFTcwyK5HT1cwfHJB3n5Eh2JE3xuXqAluU3McA+FurQ=";
|
||||
vendorHash = "sha256-dF0n1/SmQVd2BUVOPmvZWWUJYTn2mMnbgZC92luSY2s=";
|
||||
ldflags = [
|
||||
"-X=kcl-lang.io/cli/pkg/version.version=${version}"
|
||||
];
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, writeShellScript
|
||||
, dash
|
||||
@ -39,22 +38,15 @@ let
|
||||
in
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "movim";
|
||||
version = "0.24";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "movim";
|
||||
repo = "movim";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-t63POjywZLk5ulppuCedFhhEhOsnB90vy3k/HhM3MGc=";
|
||||
hash = "sha256-Ai82d1VwtAlKmM8N/hazMWsn5F6HS4I1do3VkpLPlBo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/movim/movim/commit/4dd2842f4617f3baaa166157892a532ad07df80d.patch";
|
||||
hash = "sha256-32MLS5g60Rhm8HQDBPnUo9k+aB7L8dNMcnSjPIlooks=";
|
||||
})
|
||||
];
|
||||
|
||||
php = php.buildEnv ({
|
||||
extensions = ({ all, enabled }:
|
||||
enabled
|
||||
@ -75,7 +67,7 @@ php.buildComposerProject (finalAttrs: {
|
||||
# pinned commonmark
|
||||
composerStrictValidation = false;
|
||||
|
||||
vendorHash = "sha256-SinS5ocf4kLMBR2HF3tcdmEomw9ICUqTg2IXPJFoujU=";
|
||||
vendorHash = "sha256-1sQm+eRrs9m52CepPXahsOJhyLZ68+FIDNHyY33IoD4=";
|
||||
|
||||
postPatch = ''
|
||||
# Our modules are already wrapped, removes missing *.so warnings;
|
||||
|
||||
37
pkgs/by-name/nx/nxengine-evo/assets.nix
Normal file
37
pkgs/by-name/nx/nxengine-evo/assets.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchzip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nxengine-assets";
|
||||
version = "2.6.5-1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nxengine/nxengine-evo/releases/download/v${finalAttrs.version}/NXEngine-Evo-v${finalAttrs.version}-Win64.zip";
|
||||
hash = "sha256-+PjjhJYL1yk67QJ7ixfpCRg1coQnSPpXDUIwsqp9aIM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/nxengine/
|
||||
cp -r data/ $out/share/nxengine/data
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nxengine/nxengine-evo";
|
||||
description = "Assets for nxengine-evo";
|
||||
license = with lib.licenses; [
|
||||
unfreeRedistributable
|
||||
];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.all;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
92
pkgs/by-name/nx/nxengine-evo/package.nix
Normal file
92
pkgs/by-name/nx/nxengine-evo/package.nix
Normal file
@ -0,0 +1,92 @@
|
||||
{
|
||||
lib,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
callPackage,
|
||||
cmake,
|
||||
pkg-config,
|
||||
ninja,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
libpng,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nxengine-evo";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nxengine";
|
||||
repo = "nxengine-evo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix building by adding SDL_MIXER to include path
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch";
|
||||
hash = "sha256-wlsIdN2RugOo94V3qj/AzYgrs2kf0i1Iw5zNOP8WQqI=";
|
||||
})
|
||||
# Fix buffer overflow
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch";
|
||||
hash = "sha256-fZVaZAOHgFoNakOR2MfsvRJjuLhbx+5id/bcN8w/WWo=";
|
||||
})
|
||||
# Add missing include
|
||||
(fetchpatch {
|
||||
url = "https://github.com/nxengine/nxengine-evo/commit/0076ebb11bcfec5dc5e2e923a50425f1a33a4133.patch";
|
||||
hash = "sha256-8j3fFFw8DMljV7aAFXE+eA+vkbz1HdFTMAJmk3BRU04=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
SDL2
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
libpng
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# Allow finding game assets.
|
||||
postPatch = ''
|
||||
sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd ..
|
||||
mkdir -p $out/bin/ $out/share/nxengine/
|
||||
install bin/* $out/bin/
|
||||
'' + ''
|
||||
cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data
|
||||
chmod -R a=r,a+X $out/share/nxengine/data
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
assets = callPackage ./assets.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/nxengine/nxengine-evo";
|
||||
description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)";
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
];
|
||||
mainProgram = "nx";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "paper-age";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matiaskorhonen";
|
||||
repo = "paper-age";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JlmiHnST/UnN4WsiDqSva+01odoc5h/J/mlGN3K0OfI=";
|
||||
hash = "sha256-hrqjnZmcGUgFWn8Z85oJEbeUBaF2SccytMr1AG0GGos=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zdq036ag7+mvWg4OJHtbltPlF9j49dCPNJjgVQcQ+u4=";
|
||||
cargoHash = "sha256-sFofS+POvJwGo/+tiF6dawKgQci/54tUKkQQalqT+K0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy and secure paper backups of secrets";
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages(ps: with ps; [
|
||||
apprise
|
||||
babelfish
|
||||
cffi
|
||||
chardet
|
||||
@ -47,14 +48,14 @@ let
|
||||
]);
|
||||
path = lib.makeBinPath [ coreutils par2cmdline-turbo unrar unzip p7zip util-linux ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "4.2.3";
|
||||
version = "4.3.0";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DM+sgrb7Zvtvp0th8GlOloSBcD8mG1RYyM91+uvCOgU=";
|
||||
sha256 = "sha256-2zRhDFKbWq4JA7XE5/VFbfkN2ZQcqcuqGD5kjHmeXUA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
77
pkgs/by-name/td/tdnf/package.nix
Normal file
77
pkgs/by-name/td/tdnf/package.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, curl
|
||||
, gpgme
|
||||
, libsolv
|
||||
, libxml2
|
||||
, pkg-config
|
||||
, python3
|
||||
, rpm
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tdnf";
|
||||
version = "3.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "tdnf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gj0IW0EwWBXi2s7xFdghop8f1lMhkUJVAkns5nnl7sg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl.dev
|
||||
gpgme.dev
|
||||
libsolv
|
||||
libxml2.dev
|
||||
sqlite.dev
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
rpm
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=$out"
|
||||
"-DCMAKE_INSTALL_FULL_SYSCONDIR=$out/etc"
|
||||
"-DCMAKE_INSTALL_SYSCONFDIR=$out/etc"
|
||||
"-DSYSTEMD_DIR=$out/lib/systemd/system"
|
||||
];
|
||||
|
||||
# error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'SYSCONFDIR /etc' 'SYSCONFDIR $out/etc' \
|
||||
--replace-fail '/etc/motdgen.d' '$out/etc/motdgen.d'
|
||||
substituteInPlace client/tdnf.pc.in \
|
||||
--replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@'
|
||||
substituteInPlace tools/cli/lib/tdnf-cli-libs.pc.in \
|
||||
--replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@'
|
||||
'';
|
||||
|
||||
# remove binaries used for testing from the final output
|
||||
postInstall = "rm $out/bin/*test";
|
||||
|
||||
meta = {
|
||||
description = "Tiny Dandified Yum";
|
||||
homepage = "https://github.com/vmware/tdnf";
|
||||
changelog = "https://github.com/vmware/tdnf/releases/tag/v${finalAttrs.version}";
|
||||
license = with lib.licenses; [ gpl2 lgpl21 ];
|
||||
maintainers = [ lib.maintainers.malt3 ];
|
||||
mainProgram = "tdnf";
|
||||
# rpm only supports linux
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
8
pkgs/by-name/ti/tinymist/Cargo.lock
generated
8
pkgs/by-name/ti/tinymist/Cargo.lock
generated
@ -3681,7 +3681,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
dependencies = [
|
||||
"insta",
|
||||
"lsp-server",
|
||||
@ -3778,7 +3778,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -3829,7 +3829,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-query"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"comemo 0.4.0",
|
||||
@ -3867,7 +3867,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-render"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
dependencies = [
|
||||
"base64 0.22.0",
|
||||
"log",
|
||||
|
||||
@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "tinymist";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Myriad-Dreamin";
|
||||
repo = "tinymist";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VwyuK0Ct0ifx1R5tqeucqQNrkzqzhgxPqYeuETr8SkY=";
|
||||
hash = "sha256-7YG15kt+pIxAK22QYiTApu5lBV6Afe3Jss6L5dTGsGI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
34
pkgs/by-name/tr/trak/package.nix
Normal file
34
pkgs/by-name/tr/trak/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trak";
|
||||
version = "0.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lcfd";
|
||||
repo = "trak";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YJMX7pNRWdNPyWNZ1HfpdYsKSStRWLcianLz6nScMa8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cli";
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
questionary
|
||||
typer
|
||||
] ++ typer.optional-dependencies.all;
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
meta = {
|
||||
description = "Keep a record of the time you dedicate to your projects";
|
||||
homepage = "https://github.com/lcfd/trak";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ buurro ];
|
||||
mainProgram = "trak";
|
||||
};
|
||||
}
|
||||
44
pkgs/by-name/uc/ucblogo/package.nix
Normal file
44
pkgs/by-name/uc/ucblogo/package.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wxGTK32
|
||||
, texinfo
|
||||
, tetex
|
||||
, wrapGAppsHook
|
||||
, autoconf-archive
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ucblogo-code";
|
||||
version = "6.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrincayc";
|
||||
repo = "ucblogo-code";
|
||||
rev = "ca23b30a62eaaf03ea203ae71d00dc45a046514e";
|
||||
hash = "sha256-BVNKkT0YUqI/z5W6Y/u3WbrHmaw7Z165vFt/mlzjd+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
autoconf-archive
|
||||
texinfo
|
||||
tetex
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Berkeley Logo interpreter";
|
||||
homepage = "https://github.com/jrincayc/ucblogo-code";
|
||||
changelog = "https://github.com/jrincayc/ucblogo-code/blob/${finalAttrs.src.rev}/changes.txt";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
mainProgram = "ucblogo-code";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
67
pkgs/by-name/xh/xhosts/Cargo.lock
generated
Normal file
67
pkgs/by-name/xh/xhosts/Cargo.lock
generated
Normal file
@ -0,0 +1,67 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.151"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
|
||||
|
||||
[[package]]
|
||||
name = "libnss"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48b67ef5ebef2a035ac8106c9b71176b6246be2a580ff4ee94bb80919e55b34c"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"paste 0.1.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
|
||||
dependencies = [
|
||||
"paste-impl",
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
||||
|
||||
[[package]]
|
||||
name = "paste-impl"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
|
||||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-hack"
|
||||
version = "0.5.20+deprecated"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
||||
|
||||
[[package]]
|
||||
name = "xhosts"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"libnss",
|
||||
"paste 1.0.14",
|
||||
]
|
||||
34
pkgs/by-name/xh/xhosts/package.nix
Normal file
34
pkgs/by-name/xh/xhosts/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nss-xhosts";
|
||||
version = "unstable-2023-12-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dvob";
|
||||
repo = "nss-xhosts";
|
||||
rev = "78658cc24abb2546936f2b298a27d4abdf629186";
|
||||
hash = "sha256-saK9CxN4Ek1QBlPOydzEFei1217gPe5MZrUaUHh80hI=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
postFixup = "mv $out/lib/*.so $out/lib/libnss_xhosts.so.2";
|
||||
|
||||
meta = with lib; {
|
||||
description = "NSS Module which supports wildcards";
|
||||
homepage = "https://github.com/dvob/nss-xhosts";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewcroughan ];
|
||||
mainProgram = "nss-xhosts";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,42 +0,0 @@
|
||||
From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001
|
||||
From: David McFarland <corngood@gmail.com>
|
||||
Date: Sun, 31 Dec 2023 01:48:31 -0400
|
||||
Subject: [PATCH 2/2] record downloaded packages
|
||||
|
||||
---
|
||||
.../buildBootstrapPreviouslySB.csproj | 6 +++++
|
||||
repo-projects/Directory.Build.targets | 27 +++++++++++++++++++
|
||||
2 files changed, 33 insertions(+)
|
||||
|
||||
diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
||||
index d85e32ca76..280c9eaf89 100644
|
||||
--- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
||||
+++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
||||
@@ -102,6 +102,12 @@
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
+ <Target Name="NuGetToNix" AfterTargets="Restore">
|
||||
+ <Exec
|
||||
+ Command="nuget-to-nix $(RestorePackagesPath) >$(ArchiveDir)deps.nix 2>&1"
|
||||
+ WorkingDirectory="$(MSBuildProjectDirectory)"/>
|
||||
+ </Target>
|
||||
+
|
||||
<Target Name="BuildBoostrapPreviouslySourceBuilt"
|
||||
AfterTargets="Restore"
|
||||
DependsOnTargets="GetPackagesToDownload">
|
||||
diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets
|
||||
index 3fa15da862..afd7b87088 100644
|
||||
--- a/repo-projects/Directory.Build.targets
|
||||
+++ b/repo-projects/Directory.Build.targets
|
||||
@@ -471,6 +497,7 @@
|
||||
<ItemGroup>
|
||||
<LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" />
|
||||
<LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" />
|
||||
+ <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/deps.nix" />
|
||||
<ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
|
||||
</ItemGroup>
|
||||
<MakeDir Directories="$(BuildLogsDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
|
||||
and replacements listed in the main module go.mod file, and it is a hard failure if
|
||||
vendor/modules.txt is missing.
|
||||
|
||||
Relax module consistency checks and switch back to pre go1.14 behaviour if
|
||||
vendor/modules.txt is missing regardless of go version requirement in go.mod.
|
||||
|
||||
This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
|
||||
See https://github.com/golang/go/issues/37948 for discussion.
|
||||
|
||||
diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
|
||||
index d8fd91f1fe..8bc08e6fed 100644
|
||||
--- a/src/cmd/go/internal/modload/vendor.go
|
||||
+++ b/src/cmd/go/internal/modload/vendor.go
|
||||
@@ -133,7 +133,7 @@ func checkVendorConsistency() {
|
||||
readVendorList()
|
||||
|
||||
pre114 := false
|
||||
- if semver.Compare(index.goVersionV, "v1.14") < 0 {
|
||||
+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
||||
// Go versions before 1.14 did not include enough information in
|
||||
// vendor/modules.txt to check for consistency.
|
||||
// If we know that we're on an earlier version, relax the consistency check.
|
||||
@ -1,25 +0,0 @@
|
||||
From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001
|
||||
From: Nick Cao <nickcao@nichi.co>
|
||||
Date: Tue, 20 Sep 2022 18:42:31 +0800
|
||||
Subject: [PATCH 1/2] skip building doc
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 94df626014..418f6ff268 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -229,7 +229,7 @@ define stringreplace
|
||||
endef
|
||||
|
||||
|
||||
-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
|
||||
+install: $(build_depsbindir)/stringreplace
|
||||
ifeq ($(BUNDLE_DEBUG_LIBS),1)
|
||||
@$(MAKE) $(QUIET_MAKE) all
|
||||
else
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
index 37ec73468570..b73e75aa6e59 100644
|
||||
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
||||
@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
|
||||
#endif
|
||||
|
||||
SmallString<1024> Plugin;
|
||||
- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) +
|
||||
- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" +
|
||||
+ llvm::sys::path::native(Twine("@libllvmLibdir@"
|
||||
+ "/LLVMgold") +
|
||||
Suffix,
|
||||
Plugin);
|
||||
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
||||
@ -1,80 +0,0 @@
|
||||
https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch
|
||||
https://reviews.llvm.org/D102059
|
||||
--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
||||
+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
||||
@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
|
||||
|
||||
#if SANITIZER_GLIBC
|
||||
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
|
||||
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
|
||||
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
|
||||
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
|
||||
- _(CYGETTHRESH, WRITE, sizeof(int));
|
||||
- _(CYGETTIMEOUT, WRITE, sizeof(int));
|
||||
- _(CYSETDEFTHRESH, NONE, 0);
|
||||
- _(CYSETDEFTIMEOUT, NONE, 0);
|
||||
- _(CYSETTHRESH, NONE, 0);
|
||||
- _(CYSETTIMEOUT, NONE, 0);
|
||||
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
|
||||
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
|
||||
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
|
||||
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
||||
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
||||
@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
|
||||
# include <sys/procfs.h>
|
||||
#endif
|
||||
#include <sys/user.h>
|
||||
-#include <linux/cyclades.h>
|
||||
#include <linux/if_eql.h>
|
||||
#include <linux/if_plip.h>
|
||||
#include <linux/lp.h>
|
||||
@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
||||
|
||||
#if SANITIZER_GLIBC
|
||||
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
|
||||
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
|
||||
#if EV_VERSION > (0x010000)
|
||||
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
|
||||
#else
|
||||
@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
||||
#endif // SANITIZER_LINUX
|
||||
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
|
||||
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
|
||||
- unsigned IOCTL_CYGETMON = CYGETMON;
|
||||
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
|
||||
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
|
||||
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
|
||||
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
|
||||
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
|
||||
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
|
||||
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
|
||||
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
|
||||
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
|
||||
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
||||
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
||||
@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
|
||||
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
extern unsigned struct_ax25_parms_struct_sz;
|
||||
-extern unsigned struct_cyclades_monitor_sz;
|
||||
extern unsigned struct_input_keymap_entry_sz;
|
||||
extern unsigned struct_ipx_config_data_sz;
|
||||
extern unsigned struct_kbdiacrs_sz;
|
||||
@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
|
||||
#endif // SANITIZER_LINUX
|
||||
|
||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
||||
-extern unsigned IOCTL_CYGETDEFTHRESH;
|
||||
-extern unsigned IOCTL_CYGETDEFTIMEOUT;
|
||||
-extern unsigned IOCTL_CYGETMON;
|
||||
-extern unsigned IOCTL_CYGETTHRESH;
|
||||
-extern unsigned IOCTL_CYGETTIMEOUT;
|
||||
-extern unsigned IOCTL_CYSETDEFTHRESH;
|
||||
-extern unsigned IOCTL_CYSETDEFTIMEOUT;
|
||||
-extern unsigned IOCTL_CYSETTHRESH;
|
||||
-extern unsigned IOCTL_CYSETTIMEOUT;
|
||||
extern unsigned IOCTL_EQL_EMANCIPATE;
|
||||
extern unsigned IOCTL_EQL_ENSLAVE;
|
||||
extern unsigned IOCTL_EQL_GETMASTRCFG;
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4138acf..41b4763 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
|
||||
" is also set to ON.")
|
||||
endif()
|
||||
add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
|
||||
+ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
|
||||
endif()
|
||||
|
||||
if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
|
||||
@ -1,39 +0,0 @@
|
||||
From aed233638604b46c9a0c51e08d096d47303375ca Mon Sep 17 00:00:00 2001
|
||||
From: Douglas Katzman <dougk@google.com>
|
||||
Date: Tue, 2 Jan 2024 09:20:48 -0500
|
||||
Subject: [PATCH] Fix multiple def error
|
||||
|
||||
reported by Hraban Luyat
|
||||
---
|
||||
src/runtime/gc-common.c | 1 +
|
||||
src/runtime/gc.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c
|
||||
index 51963b8ff..07536f628 100644
|
||||
--- a/src/runtime/gc-common.c
|
||||
+++ b/src/runtime/gc-common.c
|
||||
@@ -2999,6 +2999,7 @@ void recompute_gen_bytes_allocated() {
|
||||
#endif
|
||||
|
||||
#ifdef LISP_FEATURE_DARWIN_JIT
|
||||
+_Atomic(char) *page_execp;
|
||||
#include "sys_mmap.inc"
|
||||
#include <errno.h>
|
||||
/* darwin-jit has another reason to remap besides just zeroing, namely,
|
||||
diff --git a/src/runtime/gc.h b/src/runtime/gc.h
|
||||
index 804e6fce2..5fdc215c2 100644
|
||||
--- a/src/runtime/gc.h
|
||||
+++ b/src/runtime/gc.h
|
||||
@@ -151,7 +151,7 @@ extern void prepare_pages(bool commit, page_index_t start, page_index_t end,
|
||||
* squeeze a bit into the 'type' field of the page table, but it's clearer to
|
||||
* have this externally so that page type 0 remains as "free" */
|
||||
#ifdef LISP_FEATURE_DARWIN_JIT
|
||||
-_Atomic(char) *page_execp;
|
||||
+extern _Atomic(char) *page_execp;
|
||||
static inline void set_page_executable(page_index_t i, bool val) { page_execp[i] = val; }
|
||||
#endif
|
||||
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Sobolev <paveloom@riseup.net>
|
||||
Date: Tue, 21 Nov 2023 20:53:33 +0300
|
||||
Subject: [PATCH] Force-unwrap file handles.
|
||||
|
||||
---
|
||||
Sources/TSCBasic/FileSystem.swift | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift
|
||||
index 3a63bdf..a1f3d9d 100644
|
||||
--- a/Sources/TSCBasic/FileSystem.swift
|
||||
+++ b/Sources/TSCBasic/FileSystem.swift
|
||||
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Read the data one block at a time.
|
||||
let data = BufferedOutputByteStream()
|
||||
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Write the data in one chunk.
|
||||
var contents = bytes.contents
|
||||
--
|
||||
2.42.0
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdatachannel";
|
||||
version = "0.20.3";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paullouisageneau";
|
||||
repo = "libdatachannel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QVyHDeT5gh+e3jOx9PjubIVq1xQ9eA7CxbP91X/xxT8=";
|
||||
hash = "sha256-hxXDovJAmuh15jFaxY9aESoTVVJ3u2twsX31U3txans=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
492
pkgs/development/libraries/libdovi/Cargo.lock
generated
492
pkgs/development/libraries/libdovi/Cargo.lock
generated
@ -2,6 +2,15 @@
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anes"
|
||||
version = "0.1.6"
|
||||
@ -9,39 +18,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.70"
|
||||
name = "anstyle"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
|
||||
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
|
||||
|
||||
[[package]]
|
||||
name = "atty"
|
||||
version = "0.2.14"
|
||||
name = "anyhow"
|
||||
version = "1.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
dependencies = [
|
||||
"hermit-abi 0.1.19",
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
|
||||
|
||||
[[package]]
|
||||
name = "bitstream-io"
|
||||
version = "1.6.0"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e"
|
||||
checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
|
||||
|
||||
[[package]]
|
||||
name = "bitvec"
|
||||
@ -57,18 +55,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bitvec_helpers"
|
||||
version = "3.1.2"
|
||||
version = "3.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a"
|
||||
checksum = "c810ea0801e8aabb86ded7f207b0d5a7f23c804cd1b7719aba2b4970899c099a"
|
||||
dependencies = [
|
||||
"bitstream-io",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.12.0"
|
||||
version = "3.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
|
||||
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
||||
|
||||
[[package]]
|
||||
name = "cast"
|
||||
@ -84,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "ciborium"
|
||||
version = "0.2.0"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
|
||||
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
|
||||
dependencies = [
|
||||
"ciborium-io",
|
||||
"ciborium-ll",
|
||||
@ -95,15 +93,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ciborium-io"
|
||||
version = "0.2.0"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
|
||||
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
|
||||
|
||||
[[package]]
|
||||
name = "ciborium-ll"
|
||||
version = "0.2.0"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
|
||||
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
|
||||
dependencies = [
|
||||
"ciborium-io",
|
||||
"half",
|
||||
@ -111,55 +109,59 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "3.2.23"
|
||||
version = "4.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
|
||||
checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"clap_builder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"clap_lex",
|
||||
"indexmap",
|
||||
"textwrap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.2.4"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||
dependencies = [
|
||||
"os_str_bytes",
|
||||
]
|
||||
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
|
||||
|
||||
[[package]]
|
||||
name = "crc"
|
||||
version = "3.0.1"
|
||||
version = "3.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
|
||||
checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
|
||||
dependencies = [
|
||||
"crc-catalog",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crc-catalog"
|
||||
version = "2.2.0"
|
||||
version = "2.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
|
||||
checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
|
||||
|
||||
[[package]]
|
||||
name = "criterion"
|
||||
version = "0.4.0"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
|
||||
checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
|
||||
dependencies = [
|
||||
"anes",
|
||||
"atty",
|
||||
"cast",
|
||||
"ciborium",
|
||||
"clap",
|
||||
"criterion-plot",
|
||||
"is-terminal",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"num-traits",
|
||||
"once_cell",
|
||||
"oorandom",
|
||||
"plotters",
|
||||
"rayon",
|
||||
@ -181,52 +183,40 @@ dependencies = [
|
||||
"itertools",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-deque"
|
||||
version = "0.8.3"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
|
||||
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.14"
|
||||
version = "0.9.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
|
||||
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
"memoffset",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.15"
|
||||
version = "0.8.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
|
||||
|
||||
[[package]]
|
||||
name = "crunchy"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
|
||||
|
||||
[[package]]
|
||||
name = "dolby_vision"
|
||||
version = "3.1.2"
|
||||
version = "3.3.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitvec",
|
||||
@ -241,9 +231,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.8.1"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
||||
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "funty"
|
||||
@ -253,44 +249,47 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "half"
|
||||
version = "1.8.2"
|
||||
version = "2.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
|
||||
checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crunchy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.3"
|
||||
version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.19"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "1.9.3"
|
||||
version = "2.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
|
||||
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.10.5"
|
||||
@ -302,73 +301,51 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.6"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
|
||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.61"
|
||||
version = "0.3.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
|
||||
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.141"
|
||||
version = "0.2.154"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
|
||||
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.17"
|
||||
version = "0.4.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.8.0"
|
||||
name = "memchr"
|
||||
version = "2.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.15"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
|
||||
dependencies = [
|
||||
"hermit-abi 0.2.6",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "oorandom"
|
||||
@ -376,17 +353,11 @@ version = "11.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
|
||||
|
||||
[[package]]
|
||||
name = "plotters"
|
||||
version = "0.3.4"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
|
||||
checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
"plotters-backend",
|
||||
@ -397,33 +368,33 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "plotters-backend"
|
||||
version = "0.3.4"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
|
||||
checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
|
||||
|
||||
[[package]]
|
||||
name = "plotters-svg"
|
||||
version = "0.3.3"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
|
||||
checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
|
||||
dependencies = [
|
||||
"plotters-backend",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.56"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.26"
|
||||
version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@ -436,9 +407,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.7.0"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
|
||||
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
|
||||
dependencies = [
|
||||
"either",
|
||||
"rayon-core",
|
||||
@ -446,45 +417,54 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.11.0"
|
||||
version = "1.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
|
||||
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
"num_cpus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.7.3"
|
||||
version = "1.10.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
|
||||
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.29"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
||||
|
||||
[[package]]
|
||||
name = "roxmltree"
|
||||
version = "0.18.0"
|
||||
version = "0.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8"
|
||||
dependencies = [
|
||||
"xmlparser",
|
||||
]
|
||||
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.13"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
|
||||
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
@ -495,37 +475,31 @@ dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.159"
|
||||
version = "1.0.199"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
|
||||
checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.159"
|
||||
version = "1.0.199"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
|
||||
checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.13",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.95"
|
||||
version = "1.0.116"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
|
||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"itoa",
|
||||
@ -535,20 +509,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
version = "2.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
|
||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -561,12 +524,6 @@ version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
|
||||
|
||||
[[package]]
|
||||
name = "tinytemplate"
|
||||
version = "1.2.1"
|
||||
@ -579,15 +536,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.8"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.3.3"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
|
||||
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
|
||||
dependencies = [
|
||||
"same-file",
|
||||
"winapi-util",
|
||||
@ -595,9 +552,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.84"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
|
||||
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"wasm-bindgen-macro",
|
||||
@ -605,24 +562,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.84"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
|
||||
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.84"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
|
||||
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
@ -630,63 +587,114 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.84"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
|
||||
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.84"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
|
||||
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.61"
|
||||
version = "0.3.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
|
||||
checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[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-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
|
||||
[[package]]
|
||||
name = "wyz"
|
||||
@ -696,9 +704,3 @@ checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
|
||||
dependencies = [
|
||||
"tap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "xmlparser"
|
||||
version = "0.13.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libdovi";
|
||||
version = "3.1.2";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "dolby_vision";
|
||||
inherit version;
|
||||
hash = "sha256-eLmGswgxtmqGc9f8l/9qvwSm+8bi06q+Ryvo7Oyr7s0=";
|
||||
hash = "sha256-224fX+9klmWVoakU+XM7HrGa4iP4xsBJtn+686cH0qc=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmcfp";
|
||||
version = "1.2.4";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhekkel";
|
||||
repo = "libmcfp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-Xz7M3TmUHGqiYZbFGSDxsVvg4VhgoVvr9TW03UxdFBw=";
|
||||
hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,10 +19,10 @@
|
||||
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "quarto";
|
||||
version = "1.4.553";
|
||||
version = "1.4.554";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
|
||||
sha256 = "sha256-IrdUGx4b6XRmV6RHODeWukIObwy8XnsxyCKd3rwljJA=";
|
||||
sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt
|
||||
index 3f68e6dd..822de4e5 100644
|
||||
--- a/avogadro/qtplugins/templatetool/CMakeLists.txt
|
||||
+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool
|
||||
)
|
||||
|
||||
# Install the fragments
|
||||
-set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments")
|
||||
+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments")
|
||||
|
||||
# Look in parallel directory for the molecule fragment repository
|
||||
if(NOT EXISTS "${_fragments}")
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "ailment";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qjEQ+pk/5Zp1HRrT/MlpmExB86JCF4kW3UHn3/anND4=";
|
||||
hash = "sha256-3JPoO9GpnVEc4UQhhXxpj53PwK5eRsy6Ikt4qw5jGa8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
{ lib
|
||||
, aiofiles
|
||||
, asyncio-mqtt
|
||||
, awesomeversion
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, marshmallow
|
||||
, poetry-core
|
||||
, pyserial-asyncio
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
aiofiles,
|
||||
asyncio-mqtt,
|
||||
awesomeversion,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
marshmallow,
|
||||
poetry-core,
|
||||
pyserial-asyncio,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomysensors";
|
||||
version = "0.3.14";
|
||||
version = "0.3.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "MartinHjelmare";
|
||||
repo = "aiomysensors";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI=";
|
||||
hash = "sha256-kgfz8VUTtOFN1hPkNJhPdRUKQn01BJn+92Ez6lgVGbc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -32,11 +33,9 @@ buildPythonPackage rec {
|
||||
--replace-fail " --cov=src --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiofiles
|
||||
asyncio-mqtt
|
||||
awesomeversion
|
||||
@ -50,16 +49,14 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiomysensors"
|
||||
];
|
||||
pythonImportsCheck = [ "aiomysensors" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to connect to MySensors gateways";
|
||||
mainProgram = "aiomysensors";
|
||||
homepage = "https://github.com/MartinHjelmare/aiomysensors";
|
||||
changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "aiomysensors";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,29 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, prompt-toolkit
|
||||
, pythonOlder
|
||||
, winacl
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
prompt-toolkit,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
winacl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowinreg";
|
||||
version = "0.0.10";
|
||||
format = "setuptools";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skelsec";
|
||||
repo = pname;
|
||||
repo = "aiowinreg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PkrBjH+yeSLpwL9kH242xQKBsjv6a11k2c26qBwR6Fw=";
|
||||
hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
prompt-toolkit
|
||||
winacl
|
||||
@ -28,16 +32,14 @@ buildPythonPackage rec {
|
||||
# Project doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiowinreg"
|
||||
];
|
||||
pythonImportsCheck = [ "aiowinreg" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to parse the registry hive";
|
||||
mainProgram = "awinreg";
|
||||
homepage = "https://github.com/skelsec/aiowinreg";
|
||||
changelog = "https://github.com/skelsec/aiowinreg/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "awinreg";
|
||||
};
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "angr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HTyxLr1qJYnQLapxZVvM4+qByiZQe3/LsVThyYnHC8k=";
|
||||
hash = "sha256-btj1bGpS/t1uQxmMiZ+PTBqiIb7eigg1vGTPjzr4/p4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "capstone" ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "archinfo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HSADeA9zwkr8yP9sZQBNeC48L0rM+2UHNKZzFRRt4pk=";
|
||||
hash = "sha256-58iijDVs4OqZytHDjhGqYRMSIVGPCWTUNRy74OQZcPw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.95";
|
||||
version = "1.34.96";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-QSAGsn7nB+m1GghLAqySsUOvijtWcnWCr+wqds6Tw7Y=";
|
||||
hash = "sha256-gkpimXGE45wP34h7JCxEodaauH4hVMKzHVDGSvqKT8U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,55 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, bcrypt
|
||||
, build
|
||||
, buildPythonPackage
|
||||
, cargo
|
||||
, chroma-hnswlib
|
||||
, darwin
|
||||
, fastapi
|
||||
, fetchFromGitHub
|
||||
, grpcio
|
||||
, hypothesis
|
||||
, importlib-resources
|
||||
, kubernetes
|
||||
, mmh3
|
||||
, numpy
|
||||
, onnxruntime
|
||||
, openssl
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-grpc
|
||||
, opentelemetry-instrumentation-fastapi
|
||||
, opentelemetry-sdk
|
||||
, orjson
|
||||
, overrides
|
||||
, pkg-config
|
||||
, posthog
|
||||
, protobuf
|
||||
, pulsar-client
|
||||
, pydantic
|
||||
, pypika
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, requests
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, tenacity
|
||||
, tokenizers
|
||||
, tqdm
|
||||
, typer
|
||||
, typing-extensions
|
||||
, uvicorn
|
||||
, zstd
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bcrypt,
|
||||
build,
|
||||
buildPythonPackage,
|
||||
cargo,
|
||||
chroma-hnswlib,
|
||||
darwin,
|
||||
fastapi,
|
||||
fetchFromGitHub,
|
||||
grpcio,
|
||||
hypothesis,
|
||||
importlib-resources,
|
||||
kubernetes,
|
||||
mmh3,
|
||||
numpy,
|
||||
onnxruntime,
|
||||
openssl,
|
||||
opentelemetry-api,
|
||||
opentelemetry-exporter-otlp-proto-grpc,
|
||||
opentelemetry-instrumentation-fastapi,
|
||||
opentelemetry-sdk,
|
||||
orjson,
|
||||
overrides,
|
||||
pkg-config,
|
||||
posthog,
|
||||
protobuf,
|
||||
pulsar-client,
|
||||
pydantic,
|
||||
pypika,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
pyyaml,
|
||||
requests,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
tenacity,
|
||||
tokenizers,
|
||||
tqdm,
|
||||
typer,
|
||||
typing-extensions,
|
||||
uvicorn,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chromadb";
|
||||
version = "0.4.23";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -58,18 +59,16 @@ buildPythonPackage rec {
|
||||
owner = "chroma-core";
|
||||
repo = "chroma";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug=";
|
||||
hash = "sha256-gM+fexjwifF3evR8jZvMbIDz655RFKPUizrsB2q5tbw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M=";
|
||||
hash = "sha256-zyiFv/gswGupm7Y8BhviklqJzM914v0QyUsRwbGKZ48=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"orjson"
|
||||
];
|
||||
pythonRelaxDeps = [ "orjson" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
@ -85,9 +84,7 @@ buildPythonPackage rec {
|
||||
buildInputs = [
|
||||
openssl
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bcrypt
|
||||
@ -126,9 +123,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"chromadb"
|
||||
];
|
||||
pythonImportsCheck = [ "chromadb" ];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "claripy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jkPXYlV89BsW4lHvpR+1jiFP92QsPPG0BMe1SVoQOfw=";
|
||||
hash = "sha256-ecYyoFtCIsrlzcraqL8X4cZgqc243E9WXZix/70eksY=";
|
||||
};
|
||||
|
||||
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = "binaries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-U6RX+7kkb7+eYLYrE6SdJfYyDnBdGm+P3Xa3EfQv6Fk=";
|
||||
hash = "sha256-8uvhjxZOgMjE2csOxS+kUPeo/pswovBDOLp5w8d4JSk=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = "cle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-++4GakniGH6JrRfOZsrSb+JpEKa6q7MXCSe9nIoae2g=";
|
||||
hash = "sha256-cG9j3cMDwjm2DGvvgJgYfigf5e/61HKWFudgezE2zz8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,36 +1,35 @@
|
||||
{ lib
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pyserial-asyncio
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
async-timeout,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
poetry-core,
|
||||
pyserial-asyncio-fast,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elkm1-lib";
|
||||
version = "2.2.6";
|
||||
format = "pyproject";
|
||||
version = "2.2.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gwww";
|
||||
repo = "elkm1";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0=";
|
||||
hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
async-timeout
|
||||
pyserial-asyncio
|
||||
pyserial-asyncio-fast
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -38,9 +37,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"elkm1_lib"
|
||||
];
|
||||
pythonImportsCheck = [ "elkm1_lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for interacting with ElkM1 alarm/automation panel";
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
|
||||
index db55958..c27b81f 100644
|
||||
--- a/eventlet/hubs/hub.py
|
||||
+++ b/eventlet/hubs/hub.py
|
||||
@@ -21,7 +21,7 @@ else:
|
||||
|
||||
import eventlet.hubs
|
||||
from eventlet.hubs import timer
|
||||
-from eventlet.support import greenlets as greenlet, clear_sys_exc_info
|
||||
+from eventlet.support import greenlets as greenlet
|
||||
try:
|
||||
from monotonic import monotonic
|
||||
except ImportError:
|
||||
@@ -309,7 +309,6 @@ class BaseHub(object):
|
||||
cur.parent = self.greenlet
|
||||
except ValueError:
|
||||
pass # gets raised if there is a greenlet parent cycle
|
||||
- clear_sys_exc_info()
|
||||
return self.greenlet.switch()
|
||||
|
||||
def squelch_exception(self, fileno, exc_info):
|
||||
@@ -397,13 +396,11 @@ class BaseHub(object):
|
||||
if self.debug_exceptions:
|
||||
traceback.print_exception(*exc_info)
|
||||
sys.stderr.flush()
|
||||
- clear_sys_exc_info()
|
||||
|
||||
def squelch_timer_exception(self, timer, exc_info):
|
||||
if self.debug_exceptions:
|
||||
traceback.print_exception(*exc_info)
|
||||
sys.stderr.flush()
|
||||
- clear_sys_exc_info()
|
||||
|
||||
def add_timer(self, timer):
|
||||
scheduled_time = self.clock() + timer.seconds
|
||||
@@ -478,7 +475,6 @@ class BaseHub(object):
|
||||
raise
|
||||
except:
|
||||
self.squelch_timer_exception(timer, sys.exc_info())
|
||||
- clear_sys_exc_info()
|
||||
|
||||
# for debugging:
|
||||
|
||||
diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py
|
||||
index bad4a87..8438805 100644
|
||||
--- a/eventlet/hubs/kqueue.py
|
||||
+++ b/eventlet/hubs/kqueue.py
|
||||
@@ -109,4 +109,3 @@ class Hub(hub.BaseHub):
|
||||
raise
|
||||
except:
|
||||
self.squelch_exception(fileno, sys.exc_info())
|
||||
- support.clear_sys_exc_info()
|
||||
diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
|
||||
index 1bbd401..d3f9c6a 100644
|
||||
--- a/eventlet/hubs/poll.py
|
||||
+++ b/eventlet/hubs/poll.py
|
||||
@@ -113,7 +113,6 @@ class Hub(hub.BaseHub):
|
||||
raise
|
||||
except:
|
||||
self.squelch_exception(fileno, sys.exc_info())
|
||||
- support.clear_sys_exc_info()
|
||||
|
||||
if self.debug_blocking:
|
||||
self.block_detect_post()
|
||||
diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py
|
||||
index 0ead5b8..0386a1e 100644
|
||||
--- a/eventlet/hubs/selects.py
|
||||
+++ b/eventlet/hubs/selects.py
|
||||
@@ -61,4 +61,3 @@ class Hub(hub.BaseHub):
|
||||
raise
|
||||
except:
|
||||
self.squelch_exception(fileno, sys.exc_info())
|
||||
- support.clear_sys_exc_info()
|
||||
diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py
|
||||
index 43bac91..b1c1607 100644
|
||||
--- a/eventlet/support/__init__.py
|
||||
+++ b/eventlet/support/__init__.py
|
||||
@@ -30,15 +30,6 @@ def get_errno(exc):
|
||||
return None
|
||||
|
||||
|
||||
-if sys.version_info[0] < 3 and not greenlets.preserves_excinfo:
|
||||
- from sys import exc_clear as clear_sys_exc_info
|
||||
-else:
|
||||
- def clear_sys_exc_info():
|
||||
- """No-op In py3k.
|
||||
- Exception information is not visible outside of except statements.
|
||||
- sys.exc_clear became obsolete and removed."""
|
||||
- pass
|
||||
-
|
||||
if sys.version_info[0] < 3:
|
||||
def bytes_to_str(b, encoding='ascii'):
|
||||
return b
|
||||
diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py
|
||||
index d4e1793..b939328 100644
|
||||
--- a/eventlet/support/greenlets.py
|
||||
+++ b/eventlet/support/greenlets.py
|
||||
@@ -1,8 +1,4 @@
|
||||
-import distutils.version
|
||||
-
|
||||
import greenlet
|
||||
getcurrent = greenlet.greenlet.getcurrent
|
||||
GreenletExit = greenlet.greenlet.GreenletExit
|
||||
-preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__)
|
||||
- >= distutils.version.LooseVersion('0.3.2'))
|
||||
greenlet = greenlet.greenlet
|
||||
diff --git a/setup.py b/setup.py
|
||||
index a8f4684..9b927e0 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -19,7 +19,7 @@ setuptools.setup(
|
||||
packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']),
|
||||
install_requires=(
|
||||
'dnspython >= 1.15.0',
|
||||
- 'greenlet >= 0.3',
|
||||
+ 'greenlet >= 1.0',
|
||||
'monotonic >= 1.4;python_version<"3.5"',
|
||||
'six >= 1.10.0',
|
||||
),
|
||||
diff --git a/tests/hub_test.py b/tests/hub_test.py
|
||||
index a531b75..05c0024 100644
|
||||
--- a/tests/hub_test.py
|
||||
+++ b/tests/hub_test.py
|
||||
@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase):
|
||||
|
||||
class TestExceptionInGreenthread(tests.LimitedTestCase):
|
||||
|
||||
- @skip_unless(greenlets.preserves_excinfo)
|
||||
def test_exceptionpreservation(self):
|
||||
# events for controlling execution order
|
||||
gt1event = eventlet.Event()
|
||||
diff --git a/tests/test__refcount.py b/tests/test__refcount.py
|
||||
index 1090a1f..5c1c002 100644
|
||||
--- a/tests/test__refcount.py
|
||||
+++ b/tests/test__refcount.py
|
||||
@@ -57,7 +57,6 @@ def run_interaction(run_client):
|
||||
|
||||
def run_and_check(run_client):
|
||||
w = run_interaction(run_client=run_client)
|
||||
- # clear_sys_exc_info()
|
||||
gc.collect()
|
||||
fd = w()
|
||||
print('run_and_check: weakref fd:', fd)
|
||||
@ -1,42 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "fastpair";
|
||||
version = "unstable-2021-05-19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carsonfarmer";
|
||||
repo = "fastpair";
|
||||
rev = "d3170fd7e4d6e95312e7e1cb02e84077a3f06379";
|
||||
hash = "sha256-vSb6o0XvHlzev2+uQKUI66wM39ZNqDsppEc8rlB+H9E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scipy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data-structure for the dynamic closest-pair problem";
|
||||
homepage = "https://github.com/carsonfarmer/fastpair";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
|
||||
};
|
||||
}
|
||||
@ -21,6 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-WwwIxvT26mVbpYI5NjRXwQ+5IVV/UDjBpG20RX1taw4=";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
{ lib
|
||||
, bitstruct
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, jsonschema
|
||||
, lark
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
bitstruct,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
jinja2,
|
||||
jsonschema,
|
||||
lark,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ldfparser";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,14 +22,12 @@ buildPythonPackage rec {
|
||||
owner = "c4deszes";
|
||||
repo = "ldfparser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM=";
|
||||
hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
bitstruct
|
||||
jinja2
|
||||
lark
|
||||
@ -39,9 +38,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ldfparser"
|
||||
];
|
||||
pythonImportsCheck = [ "ldfparser" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# We don't care about benchmarks
|
||||
@ -50,10 +47,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "LIN Description File parser written in Python";
|
||||
mainProgram = "ldfparser";
|
||||
homepage = "https://github.com/c4deszes/ldfparser";
|
||||
changelog = "https://github.com/c4deszes/ldfparser/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "ldfparser";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linknlink";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,20 +18,14 @@ buildPythonPackage rec {
|
||||
owner = "xuanxuan000";
|
||||
repo = "python-linknlink";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MOZw+7oFHeH7Vaj6pylR7wqe3ZyHcsiG+n8jnRAQ8PA=";
|
||||
hash = "sha256-G0URNUHIh/td+A8MhIC0mePx2SmhEXhIzOpbVft33+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
];
|
||||
dependencies = [ cryptography ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"linknlink"
|
||||
];
|
||||
pythonImportsCheck = [ "linknlink" ];
|
||||
|
||||
# Module has no test
|
||||
doCheck = false;
|
||||
|
||||
@ -44,7 +44,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.32";
|
||||
version = "0.10.33";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -53,7 +53,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p+ye8o+paA6L8f1DiiiFJufyEqRn+ERNBWuhkoWfZb8=";
|
||||
hash = "sha256-UlKZX7qWb8/XeqxNTW9PawKauwZRsMjsFP+xXI1CyeE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-GexyfQSMhzkV1bA32aL+lWUgwBmxHXq4w8QG3RHzTks=";
|
||||
hash = "sha256-x5ZlS3PRA/kyTtTFXHbEm3NzirxuUNAllu1eKxxm3sU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-chroma";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_chroma";
|
||||
inherit version;
|
||||
hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s=";
|
||||
hash = "sha256-E7DXWubBvMhru31XmNva6iPm2adJKmmt5pFqKZ8fquk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-postgres";
|
||||
version = "0.1.5";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-9jE+1Gbx2y/CSqkpSfuYqgyX49yZwhwmJbiG/EHwTLw=";
|
||||
hash = "sha256-00ccEfjYY8qrNYymHQ5w43w8zAHUAntO6oiwYUwaOVw=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [ "psycopg2-binary" ];
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mplhep";
|
||||
version = "0.3.46";
|
||||
version = "0.3.47";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MEYIvKwQLbQPgaEEpSXs6v1MUQ/txzU8D0Ivd/6TlMw=";
|
||||
hash = "sha256-GDLI/Y6tWiI5JcmQJ7BnwvKPGwdAwJDN4yGOgINcdB8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,57 +1,52 @@
|
||||
{ lib
|
||||
, olefile
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, cryptography
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
olefile,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
cryptography,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msoffcrypto-tool";
|
||||
version = "5.3.1";
|
||||
format = "pyproject";
|
||||
version = "5.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nolze";
|
||||
repo = pname;
|
||||
repo = "msoffcrypto-tool";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY=";
|
||||
hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cryptography
|
||||
olefile
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# Test fails with AssertionError
|
||||
"test_cli"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"msoffcrypto"
|
||||
];
|
||||
pythonImportsCheck = [ "msoffcrypto" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python tool and library for decrypting MS Office files with passwords or other keys";
|
||||
mainProgram = "msoffcrypto-tool";
|
||||
homepage = "https://github.com/nolze/msoffcrypto-tool";
|
||||
changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "msoffcrypto-tool";
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nebula3-python";
|
||||
version = "3.5.1";
|
||||
version = "3.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "vesoft-inc";
|
||||
repo = "nebula-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9JpdCR8ewOJcvJ3fAg/AcMKtSz7NBIqWAuG9cofv0Ak=";
|
||||
hash = "sha256-tpMm13iixtg3ZF4g7YgRLyd/VqJba51QPGPmFRpy0wA=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001
|
||||
From: Ralf Gommers <ralf.gommers@gmail.com>
|
||||
Date: Thu, 26 Oct 2023 16:57:03 +0200
|
||||
Subject: [PATCH] BLD: remove last usage of `distutils` in
|
||||
`_core/code_generators/`
|
||||
|
||||
---
|
||||
numpy/core/code_generators/genapi.py | 9 ---------
|
||||
numpy/core/code_generators/generate_numpy_api.py | 7 +------
|
||||
numpy/core/code_generators/generate_ufunc_api.py | 7 +------
|
||||
3 files changed, 2 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
|
||||
index 2cdaba52d..d9d7862b2 100644
|
||||
--- a/numpy/core/code_generators/genapi.py
|
||||
+++ b/numpy/core/code_generators/genapi.py
|
||||
@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'):
|
||||
fo.close()
|
||||
return functions
|
||||
|
||||
-def should_rebuild(targets, source_files):
|
||||
- from distutils.dep_util import newer_group
|
||||
- for t in targets:
|
||||
- if not os.path.exists(t):
|
||||
- return True
|
||||
- sources = API_FILES + list(source_files) + [__file__]
|
||||
- if newer_group(sources, targets[0], missing='newer'):
|
||||
- return True
|
||||
- return False
|
||||
|
||||
def write_file(filename, data):
|
||||
"""
|
||||
diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py
|
||||
index ae38c4efc..640bae9e5 100644
|
||||
--- a/numpy/core/code_generators/generate_numpy_api.py
|
||||
+++ b/numpy/core/code_generators/generate_numpy_api.py
|
||||
@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False):
|
||||
targets = (h_file, c_file)
|
||||
|
||||
sources = numpy_api.multiarray_api
|
||||
-
|
||||
- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])):
|
||||
- return targets
|
||||
- else:
|
||||
- do_generate_api(targets, sources)
|
||||
-
|
||||
+ do_generate_api(targets, sources)
|
||||
return targets
|
||||
|
||||
def do_generate_api(targets, sources):
|
||||
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py
|
||||
index e03299a52..3734cbd6a 100644
|
||||
--- a/numpy/core/code_generators/generate_ufunc_api.py
|
||||
+++ b/numpy/core/code_generators/generate_ufunc_api.py
|
||||
@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False):
|
||||
targets = (h_file, c_file)
|
||||
|
||||
sources = ['ufunc_api_order.txt']
|
||||
-
|
||||
- if (not force and not genapi.should_rebuild(targets, sources + [__file__])):
|
||||
- return targets
|
||||
- else:
|
||||
- do_generate_api(targets, sources)
|
||||
-
|
||||
+ do_generate_api(targets, sources)
|
||||
return targets
|
||||
|
||||
def do_generate_api(targets, sources):
|
||||
--
|
||||
2.42.0
|
||||
|
||||
@ -26,6 +26,8 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-x7ywbO2uY1r06bDXV/+X/7cs9f6jFawyDHeo8pLWZVE=";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, jsonschema
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, responses
|
||||
, setuptools
|
||||
, vcrpy
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
future,
|
||||
jsonschema,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
requests,
|
||||
responses,
|
||||
setuptools,
|
||||
vcrpy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "polyswarm-api";
|
||||
version = "3.5.2";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,20 +25,14 @@ buildPythonPackage rec {
|
||||
owner = "polyswarm";
|
||||
repo = "polyswarm-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GMLgph6mjDSDn2CCfeqcqFY2gjtziH4xVHJhYTGRYw8=";
|
||||
hash = "sha256-iY0I5z+aDLQekjgHT5v/ZprCkCgNPkyImmmaCQgnoYc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"future"
|
||||
];
|
||||
pythonRelaxDeps = [ "future" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
future
|
||||
@ -52,9 +47,7 @@ buildPythonPackage rec {
|
||||
vcrpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"polyswarm_api"
|
||||
];
|
||||
pythonImportsCheck = [ "polyswarm_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to interface with the PolySwarm consumer APIs";
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "psd-tools";
|
||||
version = "1.9.31";
|
||||
version = "1.9.32";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "psd-tools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HUFJ2FP9WGcG9pkukS2LHIgPYFRAXAneiVK6VfYQ+zU=";
|
||||
hash = "sha256-H235bZOzTxmmLEFje8hhYxrN4l1S34tD1LMhsymRy9w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-motionmount";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "vogelsproducts";
|
||||
repo = "python-MotionMount";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GXgshCARH4VPYHIIeWXwOCRmKgCyel4ydj/oKUWuyUM=";
|
||||
hash = "sha256-F/nFo/PivnIogVwEh6MsQZQWg95kQMr6pZuf0SZa3n4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.100";
|
||||
version = "9.2.101";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5CjpL6uxJjZN4GwYATVnX071XYRwCuEe7P/O4szAo3Y=";
|
||||
hash = "sha256-zI86NYe0b9ppm9Zv6+zfB3UclhIm1TTqcC9vrBn3NR8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safetensors";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,13 +25,13 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = "safetensors";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hdPUI8k7CCQwt2C/AsjUHRmAL6ob+yCN97KkWtqOQL8=";
|
||||
hash = "sha256-Rc+o7epQJ8qEvdgbFnGvXxBr/U4eULZwkKNEaPlJkyU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
sourceRoot = "${src.name}/bindings/python";
|
||||
hash = "sha256-7n9aYlha6IaPsZ2zMfD5EIkrk8ENwMBwj41s6QU7ml0=";
|
||||
hash = "sha256-tzNEUvWgolSwX0t/JLgYcTEIv3/FiKxoTJ4VjFQs8AY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/bindings/python";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, lib
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
@ -9,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wikitextparser";
|
||||
version = "0.55.5";
|
||||
version = "0.55.13";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "5j9";
|
||||
repo = "wikitextparser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys=";
|
||||
hash = "sha256-qLctOX0BsKAn2JzfmV2sTLJ/KcNfaJFAjOB3pxd5LQI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -24,6 +25,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flit-core
|
||||
wcwidth
|
||||
regex
|
||||
];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xd009642";
|
||||
repo = "tarpaulin";
|
||||
rev = version;
|
||||
hash = "sha256-45jQt5VK7h02Frz5urB6dXap796OTfHsPx/Q1xumM00=";
|
||||
hash = "sha256-eLLnSfuFnvlarpFBkhq3eumIyXOuuYU9ZJHpsKt0WQE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+AKgEyKer9S2lTUF3VA4UXnbR0nUBErp2OdqFC84W00=";
|
||||
cargoHash = "sha256-bTflBJ5Rz2Xdip2ptUyGi+CpR0ZN0ggVutSk1S9nW1c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -26,6 +26,20 @@ buildGoModule rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-scrolling-layers.patch";
|
||||
url = "https://github.com/wagoodman/dive/pull/478/commits/b7da0f90880ce5e9d3bc2d0f269aadac6ee63c49.patch";
|
||||
hash = "sha256-dYqg5JpWKOzy3hVjIVCHA2vmKCtCgc8W+oHEzuGpyxc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-render-update.patch";
|
||||
url = "https://github.com/wagoodman/dive/pull/478/commits/326fb0d8c9094ac068a29fecd4f103783199392c.patch";
|
||||
hash = "sha256-NC74MqHVChv/Z5hHX8ds3FI+tC+yyBpXvZKSFG3RyC0=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user