Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d01ca839af
64 changed files with 2502 additions and 1031 deletions
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
|
@ -232,10 +232,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
|||
/nixos/modules/services/networking/babeld.nix @mweinelt
|
||||
/nixos/modules/services/networking/kea.nix @mweinelt
|
||||
/nixos/modules/services/networking/knot.nix @mweinelt
|
||||
nixos/modules/services/networking/networkmanager.nix @Janik-Haag
|
||||
/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
|
||||
/nixos/tests/babeld.nix @mweinelt
|
||||
/nixos/tests/kea.nix @mweinelt
|
||||
/nixos/tests/knot.nix @mweinelt
|
||||
/nixos/tests/networking/* @Janik-Haag
|
||||
|
||||
# Web servers
|
||||
/doc/packages/nginx.section.md @raitobezarius
|
||||
|
|
|
|||
|
|
@ -8432,6 +8432,12 @@
|
|||
github = "Icy-Thought";
|
||||
githubId = 53710398;
|
||||
};
|
||||
id3v1669 = {
|
||||
name = "id3v1669";
|
||||
email = "id3v1669@gmail.com";
|
||||
github = "id3v1669";
|
||||
githubId = 57532211;
|
||||
};
|
||||
idlip = {
|
||||
name = "Dilip";
|
||||
email = "igoldlip@gmail.com";
|
||||
|
|
@ -17343,6 +17349,11 @@
|
|||
githubId = 19433256;
|
||||
name = "Radoslaw Sniezek";
|
||||
};
|
||||
rster2002 = {
|
||||
name = "Bjørn";
|
||||
github = "rster2002";
|
||||
githubId = 26026518;
|
||||
};
|
||||
rsynnest = {
|
||||
email = "contact@rsynnest.com";
|
||||
github = "rsynnest";
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.
|
||||
|
||||
- `himalaya` was updated to `v1.0.0-beta.3`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.3) for details.
|
||||
- `himalaya` was updated to `v1.0.0-beta.4`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
|
||||
|
||||
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
|
||||
|
||||
|
|
@ -587,6 +587,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
|||
|
||||
- The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
|
||||
|
||||
- The `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string.
|
||||
|
||||
- The module `services.github-runner` has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration.
|
||||
|
||||
- The `services.slskd` has been refactored to include more configuation options in
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
serverOptions = { name, config, ... }: {
|
||||
freeformType = attrsOf (either scalarType (listOf scalarType));
|
||||
# Client system-options file directives are explained here:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=commands-processing-options
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.22?topic=commands-processing-options
|
||||
options.servername = mkOption {
|
||||
type = servernameType;
|
||||
default = name;
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ in
|
|||
environment.HOME = "/var/lib/tsm-backup";
|
||||
serviceConfig = {
|
||||
# for exit status description see
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=clients-client-return-codes
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.22?topic=clients-client-return-codes
|
||||
SuccessExitStatus = "4 8";
|
||||
# The `-se` option must come after the command.
|
||||
# The `-optfile` option suppresses a `dsm.opt`-not-found warning.
|
||||
|
|
|
|||
|
|
@ -41,8 +41,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
|
||||
|
||||
configFile = cfg.configFile;
|
||||
in {
|
||||
options.services.dockerRegistry = {
|
||||
enable = mkEnableOption "Docker Registry";
|
||||
|
|
@ -106,6 +105,17 @@ in {
|
|||
type = types.attrs;
|
||||
};
|
||||
|
||||
configFile = lib.mkOption {
|
||||
default = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
|
||||
defaultText = literalExpression ''pkgs.writeText "docker-registry-config.yml" "# my custom docker-registry-config.yml ..."'';
|
||||
description = ''
|
||||
Path to CNCF distribution config file.
|
||||
|
||||
Setting this option will override any configuration applied by the extraConfig option.
|
||||
'';
|
||||
type = types.path;
|
||||
};
|
||||
|
||||
enableGarbageCollect = mkEnableOption "garbage collect";
|
||||
|
||||
garbageCollectDates = mkOption {
|
||||
|
|
|
|||
|
|
@ -49,12 +49,12 @@ in
|
|||
passAsFile = [ "json" ];
|
||||
} ''
|
||||
${if cfg.upstreamDefaults then ''
|
||||
${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
||||
${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
|
||||
${pkgs.buildPackages.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json
|
||||
${pkgs.buildPackages.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two
|
||||
'' else ''
|
||||
cp $jsonPath config.json
|
||||
''}
|
||||
${pkgs.remarshal}/bin/json2toml < config.json > $out
|
||||
${pkgs.buildPackages.remarshal}/bin/json2toml < config.json > $out
|
||||
'';
|
||||
defaultText = literalMD "TOML file generated from {option}`services.dnscrypt-proxy2.settings`";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,49 +10,31 @@ let
|
|||
|
||||
enableIwd = cfg.wifi.backend == "iwd";
|
||||
|
||||
mkValue = v:
|
||||
if v == true then "yes"
|
||||
else if v == false then "no"
|
||||
else if lib.isInt v then toString v
|
||||
else v;
|
||||
|
||||
mkSection = name: attrs: ''
|
||||
[${name}]
|
||||
${
|
||||
lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList
|
||||
(k: v: "${k}=${mkValue v}")
|
||||
(lib.filterAttrs
|
||||
(k: v: v != null)
|
||||
attrs))
|
||||
}
|
||||
'';
|
||||
|
||||
configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [
|
||||
(mkSection "main" {
|
||||
configAttrs = lib.recursiveUpdate {
|
||||
main = {
|
||||
plugins = "keyfile";
|
||||
inherit (cfg) dhcp dns;
|
||||
# If resolvconf is disabled that means that resolv.conf is managed by some other module.
|
||||
rc-manager =
|
||||
if config.networking.resolvconf.enable then "resolvconf"
|
||||
else "unmanaged";
|
||||
})
|
||||
(mkSection "keyfile" {
|
||||
};
|
||||
keyfile = {
|
||||
unmanaged-devices =
|
||||
if cfg.unmanaged == [ ] then null
|
||||
else lib.concatStringsSep ";" cfg.unmanaged;
|
||||
})
|
||||
(mkSection "logging" {
|
||||
if cfg.unmanaged == [ ] then null
|
||||
else lib.concatStringsSep ";" cfg.unmanaged;
|
||||
};
|
||||
logging = {
|
||||
audit = config.security.audit.enable;
|
||||
level = cfg.logLevel;
|
||||
})
|
||||
(mkSection "connection" cfg.connectionConfig)
|
||||
(mkSection "device" {
|
||||
"wifi.scan-rand-mac-address" = cfg.wifi.scanRandMacAddress;
|
||||
"wifi.backend" = cfg.wifi.backend;
|
||||
})
|
||||
cfg.extraConfig
|
||||
]);
|
||||
};
|
||||
connection = cfg.connectionConfig;
|
||||
device = {
|
||||
"wifi.scan-rand-mac-address" = cfg.wifi.scanRandMacAddress;
|
||||
"wifi.backend" = cfg.wifi.backend;
|
||||
};
|
||||
} cfg.settings;
|
||||
configFile = ini.generate "NetworkManager.conf" configAttrs;
|
||||
|
||||
/*
|
||||
[network-manager]
|
||||
|
|
@ -145,7 +127,7 @@ in
|
|||
{
|
||||
|
||||
meta = {
|
||||
maintainers = teams.freedesktop.members;
|
||||
maintainers = teams.freedesktop.members ++ [ lib.maintainers.janik ];
|
||||
};
|
||||
|
||||
###### interface
|
||||
|
|
@ -185,11 +167,11 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
settings = mkOption {
|
||||
type = ini.type;
|
||||
default = {};
|
||||
description = ''
|
||||
Configuration appended to the generated NetworkManager.conf.
|
||||
Configuration added to the generated NetworkManager.conf, note that you can overwrite settings with this.
|
||||
Refer to
|
||||
[
|
||||
https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html
|
||||
|
|
@ -471,8 +453,28 @@ in
|
|||
imports = [
|
||||
(mkRenamedOptionModule
|
||||
[ "networking" "networkmanager" "packages" ]
|
||||
[ "networking" "networkmanager" "plugins" ])
|
||||
(mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
|
||||
[ "networking" "networkmanager" "plugins" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "networking" "networkmanager" "useDnsmasq" ]
|
||||
[ "networking" "networkmanager" "dns" ]
|
||||
)
|
||||
(mkRemovedOptionModule [ "networking" "networkmanager" "extraConfig" ] ''
|
||||
This option was removed in favour of `networking.networkmanager.settings`,
|
||||
which accepts structured nix-code equivalent to the ini
|
||||
and allows for overriding settings.
|
||||
Example patch:
|
||||
```patch
|
||||
networking.networkmanager = {
|
||||
- extraConfig = '''
|
||||
- [main]
|
||||
- no-auto-default=*
|
||||
- '''
|
||||
+ extraConfig.main.no-auto-default = "*";
|
||||
};
|
||||
```
|
||||
''
|
||||
)
|
||||
(mkRemovedOptionModule [ "networking" "networkmanager" "enableFccUnlock" ] ''
|
||||
This option was removed, because using bundled FCC unlock scripts is risky,
|
||||
might conflict with vendor-provided unlock scripts, and should
|
||||
|
|
|
|||
|
|
@ -599,6 +599,7 @@ in {
|
|||
netdata = handleTest ./netdata.nix {};
|
||||
networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
|
||||
networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
|
||||
networking.networkmanager = handleTest ./networking/networkmanager.nix {};
|
||||
netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; };
|
||||
netbox_3_7 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_7; };
|
||||
netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
name = "docker-registry";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ globin ironpinguin ];
|
||||
maintainers = [ globin ironpinguin cafkafk ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
|
|||
172
nixos/tests/networking/networkmanager.nix
Normal file
172
nixos/tests/networking/networkmanager.nix
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
{ system ? builtins.currentSystem
|
||||
, config ? {}
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../../lib/testing-python.nix { inherit system pkgs; };
|
||||
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
# this is intended as a client test since you shouldn't use NetworkManager for a router or server
|
||||
# so using systemd-networkd for the router vm is fine in these tests.
|
||||
router = import ./router.nix { networkd = true; };
|
||||
qemu-common = import ../../lib/qemu-common.nix { inherit (pkgs) lib pkgs; };
|
||||
clientConfig = extraConfig: lib.recursiveUpdate {
|
||||
networking.useDHCP = false;
|
||||
|
||||
# Make sure that only NetworkManager configures the interface
|
||||
networking.interfaces = lib.mkForce {
|
||||
eth1 = {};
|
||||
};
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
# this is needed so NM doesn't generate 'Wired Connection' profiles and instead uses the default one
|
||||
settings.main.no-auto-default = "*";
|
||||
ensureProfiles.profiles.default = {
|
||||
connection = {
|
||||
id = "default";
|
||||
type = "ethernet";
|
||||
interface-name = "eth1";
|
||||
autoconnect = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
} extraConfig;
|
||||
testCases = {
|
||||
static = {
|
||||
name = "static";
|
||||
nodes = {
|
||||
inherit router;
|
||||
client = clientConfig {
|
||||
networking.networkmanager.ensureProfiles.profiles.default = {
|
||||
ipv4.method = "manual";
|
||||
ipv4.addresses = "192.168.1.42/24";
|
||||
ipv4.gateway = "192.168.1.1";
|
||||
ipv6.method = "manual";
|
||||
ipv6.addresses = "fd00:1234:5678:1::42/64";
|
||||
ipv6.gateway = "fd00:1234:5678:1::1";
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
router.systemctl("start network-online.target")
|
||||
router.wait_for_unit("network-online.target")
|
||||
client.wait_for_unit("NetworkManager.service")
|
||||
|
||||
with subtest("Wait until we have an ip address on each interface"):
|
||||
client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'")
|
||||
client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'")
|
||||
|
||||
with subtest("Test if icmp echo works"):
|
||||
client.wait_until_succeeds("ping -c 1 192.168.3.1")
|
||||
client.wait_until_succeeds("ping -c 1 fd00:1234:5678:3::1")
|
||||
router.wait_until_succeeds("ping -c 1 192.168.1.42")
|
||||
router.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::42")
|
||||
'';
|
||||
};
|
||||
auto = {
|
||||
name = "auto";
|
||||
nodes = {
|
||||
inherit router;
|
||||
client = clientConfig {
|
||||
networking.networkmanager.ensureProfiles.profiles.default = {
|
||||
ipv4.method = "auto";
|
||||
ipv6.method = "auto";
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
router.systemctl("start network-online.target")
|
||||
router.wait_for_unit("network-online.target")
|
||||
client.wait_for_unit("NetworkManager.service")
|
||||
|
||||
with subtest("Wait until we have an ip address on each interface"):
|
||||
client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'")
|
||||
client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'")
|
||||
|
||||
with subtest("Test if icmp echo works"):
|
||||
client.wait_until_succeeds("ping -c 1 192.168.1.1")
|
||||
client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")
|
||||
router.wait_until_succeeds("ping -c 1 192.168.1.2")
|
||||
router.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::2")
|
||||
'';
|
||||
};
|
||||
dns = {
|
||||
name = "dns";
|
||||
nodes = {
|
||||
inherit router;
|
||||
dynamic = clientConfig {
|
||||
networking.networkmanager.ensureProfiles.profiles.default = {
|
||||
ipv4.method = "auto";
|
||||
};
|
||||
};
|
||||
static = clientConfig {
|
||||
networking.networkmanager.ensureProfiles.profiles.default = {
|
||||
ipv4 = {
|
||||
method = "auto";
|
||||
ignore-auto-dns = "true";
|
||||
dns = "10.10.10.10";
|
||||
dns-search = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
router.systemctl("start network-online.target")
|
||||
router.wait_for_unit("network-online.target")
|
||||
dynamic.wait_for_unit("NetworkManager.service")
|
||||
static.wait_for_unit("NetworkManager.service")
|
||||
|
||||
dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'")
|
||||
static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'")
|
||||
static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'")
|
||||
'';
|
||||
};
|
||||
dispatcherScripts = {
|
||||
name = "dispatcherScripts";
|
||||
nodes.client = clientConfig {
|
||||
networking.networkmanager.dispatcherScripts = [{
|
||||
type = "pre-up";
|
||||
source = pkgs.writeText "testHook" ''
|
||||
touch /tmp/dispatcher-scripts-are-working
|
||||
'';
|
||||
}];
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
client.wait_for_unit("NetworkManager.service")
|
||||
client.wait_until_succeeds("stat /tmp/dispatcher-scripts-are-working")
|
||||
'';
|
||||
};
|
||||
envsubst = {
|
||||
name = "envsubst";
|
||||
nodes.client = let
|
||||
# you should never write secrets in to your nixos configuration, please use tools like sops-nix or agenix
|
||||
secretFile = pkgs.writeText "my-secret.env" ''
|
||||
MY_SECRET_IP=fd00:1234:5678:1::23/64
|
||||
'';
|
||||
in clientConfig {
|
||||
networking.networkmanager.ensureProfiles.environmentFiles = [ secretFile ];
|
||||
networking.networkmanager.ensureProfiles.profiles.default = {
|
||||
ipv6.method = "manual";
|
||||
ipv6.addresses = "$MY_SECRET_IP";
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
start_all()
|
||||
client.wait_for_unit("NetworkManager.service")
|
||||
client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'")
|
||||
client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::23")
|
||||
'';
|
||||
};
|
||||
};
|
||||
in lib.mapAttrs (lib.const (attrs: makeTest (attrs // {
|
||||
name = "${attrs.name}-Networking-NetworkManager";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ janik ];
|
||||
};
|
||||
|
||||
}))) testCases
|
||||
1156
pkgs/applications/audio/waylyrics/Cargo.lock
generated
1156
pkgs/applications/audio/waylyrics/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waylyrics";
|
||||
version = "0.2.15";
|
||||
version = "0.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "poly000";
|
||||
repo = "waylyrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dGtotQfS5Ve3rl6iSsqOzs0/dOePfoRZ9Wlg9zHCXSY=";
|
||||
hash = "sha256-y8FBZ/BvCj7CBfQlNE1Ay2nuP41WC14dfTeOJhTbHYs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -5062,6 +5062,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/neoclide/jsonc.vim/";
|
||||
};
|
||||
|
||||
jsonfly-nvim = buildVimPlugin {
|
||||
pname = "jsonfly.nvim";
|
||||
version = "2024-04-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Myzel394";
|
||||
repo = "jsonfly.nvim";
|
||||
rev = "539a0b79a5ea75d201e1e90cebfe9367154d04fc";
|
||||
sha256 = "1v1i4x2px0zs65rxkf2yhnxn6clx33vdr54r9gaqq713qj5ddlfm";
|
||||
};
|
||||
meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/";
|
||||
};
|
||||
|
||||
julia-vim = buildVimPlugin {
|
||||
pname = "julia-vim";
|
||||
version = "2023-12-15";
|
||||
|
|
|
|||
|
|
@ -424,6 +424,7 @@ https://github.com/nanotech/jellybeans.vim/,,
|
|||
https://github.com/HiPhish/jinja.vim/,HEAD,
|
||||
https://github.com/vito-c/jq.vim/,,
|
||||
https://github.com/neoclide/jsonc.vim/,,
|
||||
https://github.com/Myzel394/jsonfly.nvim/,HEAD,
|
||||
https://github.com/JuliaEditorSupport/julia-vim/,,
|
||||
https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
|
||||
https://github.com/rebelot/kanagawa.nvim/,,
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "converseen";
|
||||
version = "0.12.1.0";
|
||||
version = "0.12.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faster3ck";
|
||||
repo = "Converseen";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-WGOmnaO9IAcsOg5W2kJ1dxOk1ndn6InCVVN4FTehKTk=";
|
||||
hash = "sha256-nAX5o+rqQCwBTizqwLPewmhlYQbxlPj158U+v3Z08fQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
python-dateutil
|
||||
rich
|
||||
trio
|
||||
];
|
||||
packaging
|
||||
] ++ httpx.optional-dependencies.http2;
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, Security
|
||||
, darwin
|
||||
, installShellFiles
|
||||
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
|
|
@ -16,26 +14,34 @@
|
|||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
# Learn more about available cargo features at:
|
||||
# - <https://pimalaya.org/himalaya/cli/latest/installation.html#cargo>
|
||||
inherit buildNoDefaultFeatures buildFeatures;
|
||||
|
||||
pname = "himalaya";
|
||||
version = "1.0.0-beta.3";
|
||||
version = "1.0.0-beta.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk=";
|
||||
hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8=";
|
||||
cargoSha256 = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
NIX_LDFLAGS = lib.optionals stdenv.isDarwin [
|
||||
"-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks"
|
||||
"-framework"
|
||||
"AppKit"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config
|
||||
++ lib.optional (installManPages || installShellCompletions) installShellFiles;
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ])
|
||||
++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch
|
||||
++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme;
|
||||
|
||||
|
|
@ -13,16 +13,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "i2p";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchzip {
|
||||
urls = map (mirror: "${mirror}${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
|
||||
"https://github.com/i2p/i2p.i2p/releases/download/i2p-"
|
||||
urls = [
|
||||
"https://github.com/i2p/i2p.i2p/archive/i2p-${finalAttrs.version}.tar.gz"
|
||||
] ++ (map (mirror: "${mirror}${finalAttrs.version}/i2psource_${finalAttrs.version}.tar.bz2") [
|
||||
"https://download.i2p2.de/releases/"
|
||||
"https://files.i2p-projekt.de/"
|
||||
"https://download.i2p2.no/releases/"
|
||||
];
|
||||
hash = "sha256-RESN1qA/SD9MajUSJyXssNZnph2XZge7xr2kTgOp5V4=";
|
||||
]);
|
||||
hash = "sha256-mGBt2BrHU2ETV3jRay5tEpMJEO3b3K6BlBjYZNedtEA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
32
pkgs/by-name/mp/mpris-notifier/package.nix
Normal file
32
pkgs/by-name/mp/mpris-notifier/package.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mpris-notifier";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "l1na-forever";
|
||||
repo = "mpris-notifier";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B1nfVsn95oe2FlHFjb9O4tfL/EqsZZ4JGF0mbJcCg2Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8WzG712/soPgooyR35L8aFIRfPC2MvV3vCcPbkTgoF0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dependency-light, highly-customizable, XDG desktop notification generator for MPRIS status changes";
|
||||
homepage = "https://github.com/l1na-forever/mpris-notifier";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ leixb ];
|
||||
mainProgram = "mpris-notifier";
|
||||
};
|
||||
}
|
||||
44
pkgs/by-name/my/myxer/package.nix
Normal file
44
pkgs/by-name/my/myxer/package.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, libpulseaudio
|
||||
, glib
|
||||
, pango
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "myxer";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aurailus";
|
||||
repo = "myxer";
|
||||
rev = version;
|
||||
hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IH+SLIHO/wu+przH+mgOEnH9m+iAE5s/BJhh0UUHR/0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ libpulseaudio glib pango gtk3 ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 Myxer.desktop $out/share/applications/Myxer.desktop
|
||||
'';
|
||||
|
||||
# Currently no tests are implemented, so we avoid building the package twice
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern Volume Mixer for PulseAudio";
|
||||
homepage = "https://github.com/Aurailus/Myxer";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ erin rster2002 ];
|
||||
mainProgram = "myxer";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -24,15 +24,38 @@
|
|||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
|
||||
esbuild-18-20 = let version = "0.18.20";
|
||||
in esbuild.override {
|
||||
buildGoModule = args:
|
||||
buildGoModule (args // {
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
};
|
||||
|
||||
wasm-bindgen-cli-2-92 = wasm-bindgen-cli.override {
|
||||
version = "0.2.92";
|
||||
hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
|
||||
cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "surrealist";
|
||||
version = "1.11.5";
|
||||
version = "1.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StarlaneStudios";
|
||||
repo = "Surrealist";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-9hm45bTvOhDHYYFUs7nTdOkHOsDJUiqDv8F6wQqEdFs=";
|
||||
hash = "sha256-1jTvbr7jFo2GOB79ClwtBVVnNQlSEkqY2eqbiZxWG74=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src-tauri";
|
||||
|
|
@ -47,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/src-embed";
|
||||
hash = "sha256-sf1sn3lOKvUu5MXxdMohS1DJ8jP9icZGftJKhrWA/JE=";
|
||||
hash = "sha256-0cAhaeoP8EPcE1230CyznQZZIKRs0lrI8XOXECgb8pg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -56,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
llvmPackages_15.clangNoLibc
|
||||
llvmPackages_15.lld
|
||||
rustPlatform.cargoSetupHook
|
||||
wasm-bindgen-cli
|
||||
wasm-bindgen-cli-2-92
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
|
@ -103,20 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pname = "${finalAttrs.pname}-ui";
|
||||
dontFixup = true;
|
||||
|
||||
ESBUILD_BINARY_PATH = let version = "0.18.20";
|
||||
in "${lib.getExe (esbuild.override {
|
||||
buildGoModule = args:
|
||||
buildGoModule (args // {
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
|
||||
};
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
});
|
||||
})}";
|
||||
ESBUILD_BINARY_PATH = "${lib.getExe esbuild-18-20}";
|
||||
|
||||
nativeBuildInputs = [ nodePackages.pnpm ];
|
||||
|
||||
|
|
|
|||
29
pkgs/by-name/vo/voidmap/package.nix
Normal file
29
pkgs/by-name/vo/voidmap/package.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "voidmap";
|
||||
version = "1.1.5-unstable-2023-09-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "void-rs";
|
||||
repo = "void";
|
||||
rev = "ab32290632fa9477a7e59b884bdfa69fb4b91906";
|
||||
hash = "sha256-+P83psu+BYzgC/I/Ul7vrbZ99KIybd410/ycsIY1pGI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+UhqGl7w2jtGBFgX4u/g8tGO0NJTkDAJdNfwe8RobPQ=";
|
||||
|
||||
checkFlags = [
|
||||
# The test utilizes a redirect stdout to file with dup2 and breaks sandbox assumptions
|
||||
"--skip=screen::qc_input_events_dont_crash_void"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A terminal-based personal organizer";
|
||||
homepage = "https://github.com/void-rs/void";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "void";
|
||||
maintainers = with lib.maintainers; [ poptart ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "24.03.12";
|
||||
version = "24.04.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dMPbu23e8ZCDZCYpbfoRwbtDMcy/+IImjGV17Sb5DBk=";
|
||||
sha256 = "sha256-PYsGP0Snn9A5cJ5CG+RyjC+TJwAqJOFQdnYIUkugnq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-mahjongg";
|
||||
version = "3.40.0";
|
||||
version = "3.40.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "WorIbXY8VmDdkCX3vAgxC5IjRvp+Lfe2SMmJTa4/GD8=";
|
||||
hash = "sha256-jtVO7K3jawgzaQb9jmyQKg1ve7u7Z2U8I5Vqa2MSI/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
14
pkgs/development/libraries/boost/1.85.nix
Normal file
14
pkgs/development/libraries/boost/1.85.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.85.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_85_0.html
|
||||
sha256 = "7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617";
|
||||
};
|
||||
})
|
||||
|
|
@ -25,4 +25,5 @@ in {
|
|||
boost182 = makeBoost ./1.82.nix;
|
||||
boost183 = makeBoost ./1.83.nix;
|
||||
boost184 = makeBoost ./1.84.nix;
|
||||
boost185 = makeBoost ./1.85.nix;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541";
|
||||
version = "1.3.9";
|
||||
version = "1.3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541";
|
||||
repo = "open62541";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw=";
|
||||
hash = "sha256-FekO0cKgpYulMXz4r0/TUPz2tawC4k3Sq07Og4xqh4I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
let
|
||||
# Determine the Android os identifier from Nix's system identifier
|
||||
os = if stdenv.system == "x86_64-linux" then "linux"
|
||||
else if stdenv.system == "x86_64-darwin" then "macosx"
|
||||
os = if stdenv.isLinux then "linux"
|
||||
else if stdenv.isDarwin then "macosx"
|
||||
else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";
|
||||
|
||||
# Uses mkrepo.rb to create a repo spec.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adlfs";
|
||||
version = "2024.4.0";
|
||||
version = "2024.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "fsspec";
|
||||
repo = "adlfs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-t+7LcjgDrKbTY/WiBqLSkt/Wh+4niulN7G5PIpWN7WU=";
|
||||
hash = "sha256-u7iQCAfJDnN8MgFZDf/rPUM94HXAr+yzsajuKtmdX4s=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.84";
|
||||
version = "1.34.86";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-t+D++dPLD7Yw+GvBYB3GLjkvMer9WdtB4y0PIqUpwcc=";
|
||||
hash = "sha256-Lg0XDWJ0VKHYtoXvP07tjArfY08Z6clvGVyjrvc3pi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cryptography
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
cryptography,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "broadlink";
|
||||
version = "0.18.3";
|
||||
format = "setuptools";
|
||||
version = "0.19.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3+WKuMbH79v2i4wurObKQZowCmFbVsxlQp3aSk+eelg=";
|
||||
hash = "sha256-ID5YpUjio68xChs6ZhTQBW995kqbmwsASRJKQ1a5M2U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ cryptography ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"broadlink"
|
||||
];
|
||||
pythonImportsCheck = [ "broadlink" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for controlling Broadlink IR controllers";
|
||||
homepage = "https://github.com/mjg59/python-broadlink";
|
||||
homepage = "https://github.com/mjg59/python-broadlink";
|
||||
changelog = "https://github.com/mjg59/python-broadlink/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
|
|
|||
|
|
@ -1,63 +1,64 @@
|
|||
{ lib
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, configobj
|
||||
, distro
|
||||
, dpath
|
||||
, dvc-azure
|
||||
, dvc-data
|
||||
, dvc-gdrive
|
||||
, dvc-gs
|
||||
, dvc-hdfs
|
||||
, dvc-http
|
||||
, dvc-render
|
||||
, dvc-s3
|
||||
, dvc-ssh
|
||||
, dvc-studio-client
|
||||
, dvc-task
|
||||
, fetchFromGitHub
|
||||
, flatten-dict
|
||||
, flufl-lock
|
||||
, funcy
|
||||
, grandalf
|
||||
, gto
|
||||
, hydra-core
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, iterative-telemetry
|
||||
, networkx
|
||||
, packaging
|
||||
, pathspec
|
||||
, platformdirs
|
||||
, psutil
|
||||
, pydot
|
||||
, pygtrie
|
||||
, pyparsing
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, rich
|
||||
, ruamel-yaml
|
||||
, scmrepo
|
||||
, setuptools-scm
|
||||
, shortuuid
|
||||
, shtab
|
||||
, tabulate
|
||||
, tomlkit
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
, voluptuous
|
||||
, zc-lockfile
|
||||
, enableGoogle ? false
|
||||
, enableAWS ? false
|
||||
, enableAzure ? false
|
||||
, enableSSH ? false
|
||||
{
|
||||
lib,
|
||||
appdirs,
|
||||
buildPythonPackage,
|
||||
colorama,
|
||||
configobj,
|
||||
distro,
|
||||
dpath,
|
||||
dvc-azure,
|
||||
dvc-data,
|
||||
dvc-gdrive,
|
||||
dvc-gs,
|
||||
dvc-hdfs,
|
||||
dvc-http,
|
||||
dvc-render,
|
||||
dvc-s3,
|
||||
dvc-ssh,
|
||||
dvc-studio-client,
|
||||
dvc-task,
|
||||
fetchFromGitHub,
|
||||
flatten-dict,
|
||||
flufl-lock,
|
||||
funcy,
|
||||
grandalf,
|
||||
gto,
|
||||
hydra-core,
|
||||
importlib-metadata,
|
||||
importlib-resources,
|
||||
iterative-telemetry,
|
||||
networkx,
|
||||
packaging,
|
||||
pathspec,
|
||||
platformdirs,
|
||||
psutil,
|
||||
pydot,
|
||||
pygtrie,
|
||||
pyparsing,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
requests,
|
||||
rich,
|
||||
ruamel-yaml,
|
||||
scmrepo,
|
||||
setuptools-scm,
|
||||
shortuuid,
|
||||
shtab,
|
||||
tabulate,
|
||||
tomlkit,
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
voluptuous,
|
||||
zc-lockfile,
|
||||
enableGoogle ? false,
|
||||
enableAWS ? false,
|
||||
enableAzure ? false,
|
||||
enableSSH ? false,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.49.0";
|
||||
version = "3.50.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -66,7 +67,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = "dvc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Qu2+zTcTIPxLRZn1GB3Q6465kSEAuN+wessBVgxEdFU=";
|
||||
hash = "sha256-/MvKWpJzKWLj1+y8nPMQiAwdktmQyJNM+s6ctYNk9u0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -81,79 +82,64 @@ buildPythonPackage rec {
|
|||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
appdirs
|
||||
colorama
|
||||
configobj
|
||||
distro
|
||||
dpath
|
||||
dvc-data
|
||||
dvc-http
|
||||
dvc-render
|
||||
dvc-studio-client
|
||||
dvc-task
|
||||
flatten-dict
|
||||
flufl-lock
|
||||
funcy
|
||||
grandalf
|
||||
gto
|
||||
hydra-core
|
||||
iterative-telemetry
|
||||
networkx
|
||||
packaging
|
||||
pathspec
|
||||
platformdirs
|
||||
psutil
|
||||
pydot
|
||||
pygtrie
|
||||
pyparsing
|
||||
requests
|
||||
rich
|
||||
ruamel-yaml
|
||||
scmrepo
|
||||
shortuuid
|
||||
shtab
|
||||
tabulate
|
||||
tomlkit
|
||||
tqdm
|
||||
typing-extensions
|
||||
voluptuous
|
||||
zc-lockfile
|
||||
]
|
||||
++ lib.optionals enableGoogle passthru.optional-dependencies.gs
|
||||
++ lib.optionals enableAWS passthru.optional-dependencies.s3
|
||||
++ lib.optionals enableAzure passthru.optional-dependencies.azure
|
||||
++ lib.optionals enableSSH passthru.optional-dependencies.ssh
|
||||
++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
appdirs
|
||||
colorama
|
||||
configobj
|
||||
distro
|
||||
dpath
|
||||
dvc-data
|
||||
dvc-http
|
||||
dvc-render
|
||||
dvc-studio-client
|
||||
dvc-task
|
||||
flatten-dict
|
||||
flufl-lock
|
||||
funcy
|
||||
grandalf
|
||||
gto
|
||||
hydra-core
|
||||
iterative-telemetry
|
||||
networkx
|
||||
packaging
|
||||
pathspec
|
||||
platformdirs
|
||||
psutil
|
||||
pydot
|
||||
pygtrie
|
||||
pyparsing
|
||||
requests
|
||||
rich
|
||||
ruamel-yaml
|
||||
scmrepo
|
||||
shortuuid
|
||||
shtab
|
||||
tabulate
|
||||
tomlkit
|
||||
tqdm
|
||||
typing-extensions
|
||||
voluptuous
|
||||
zc-lockfile
|
||||
]
|
||||
++ lib.optionals enableGoogle passthru.optional-dependencies.gs
|
||||
++ lib.optionals enableAWS passthru.optional-dependencies.s3
|
||||
++ lib.optionals enableAzure passthru.optional-dependencies.azure
|
||||
++ lib.optionals enableSSH passthru.optional-dependencies.ssh
|
||||
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]
|
||||
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
azure = [
|
||||
dvc-azure
|
||||
];
|
||||
gdrive = [
|
||||
dvc-gdrive
|
||||
];
|
||||
gs = [
|
||||
dvc-gs
|
||||
];
|
||||
hdfs = [
|
||||
dvc-hdfs
|
||||
];
|
||||
s3 = [
|
||||
dvc-s3
|
||||
];
|
||||
ssh = [
|
||||
dvc-ssh
|
||||
];
|
||||
azure = [ dvc-azure ];
|
||||
gdrive = [ dvc-gdrive ];
|
||||
gs = [ dvc-gs ];
|
||||
hdfs = [ dvc-hdfs ];
|
||||
s3 = [ dvc-s3 ];
|
||||
ssh = [ dvc-ssh ];
|
||||
};
|
||||
|
||||
# Tests require access to real cloud services
|
||||
|
|
@ -169,7 +155,10 @@ buildPythonPackage rec {
|
|||
homepage = "https://dvc.org";
|
||||
changelog = "https://github.com/iterative/dvc/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmcdragonkai fab ];
|
||||
maintainers = with maintainers; [
|
||||
cmcdragonkai
|
||||
fab
|
||||
];
|
||||
mainProgram = "dvc";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.30.1";
|
||||
version = "1.31.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-99yI4stPZ0FSOgypdOoUJn85JmzRS+VUHNAh4Chak74=";
|
||||
hash = "sha256-1BbYIjVlAEz3cnPx3tzQ5z8z415X3TZJjUsr5aXcs4w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-community";
|
||||
version = "0.0.32";
|
||||
version = "0.0.33";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "langchain_community";
|
||||
inherit version;
|
||||
hash = "sha256-FRAhfWRsg4D1TphQNR9tKgsN1zxQG2Zsb0tAuqgWCyk=";
|
||||
hash = "sha256-u1bbwe8RygnyWEaOETaHga3akhnhRAc+MM2mlJbTQrI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-core";
|
||||
version = "0.1.43";
|
||||
version = "0.1.44";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "langchain_core";
|
||||
inherit version;
|
||||
hash = "sha256-SZEz+two7899JDBiNlIVGAgLsQ/Yv290Jt5KK78q67U=";
|
||||
hash = "sha256-4xOXXZrikmNC5vKtdgM40x8YsSI+m4tNxAja7q3kaoM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
attr,
|
||||
buildPythonPackage,
|
||||
fastapi,
|
||||
fetchFromGitHub,
|
||||
freezegun,
|
||||
httpx,
|
||||
orjson,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
|
|
@ -12,11 +15,12 @@
|
|||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
requests,
|
||||
uvicorn,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.1.45";
|
||||
version = "0.1.48";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8A9wqhM8U5Q8o0uMyu+LQKhV+1Nsyg4opJjwylc6kkI=";
|
||||
hash = "sha256-n24rlulncJHNyHFqszEbALGfnT7+tTGjLjwR7Fw1smI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
|
@ -44,10 +48,14 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
attr
|
||||
fastapi
|
||||
freezegun
|
||||
httpx
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
uvicorn
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
attr
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -71,6 +79,8 @@ buildPythonPackage rec {
|
|||
# due to circular import
|
||||
"tests/integration_tests/test_client.py"
|
||||
"tests/unit_tests/test_client.py"
|
||||
# Tests require a Langsmith API key
|
||||
"tests/evaluation/test_evaluation.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "langsmith" ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, llama-index-embeddings-openai
|
||||
, llama-index-llms-openai
|
||||
, llama-index-vector-stores-chroma
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-index-core,
|
||||
llama-index-embeddings-openai,
|
||||
llama-index-llms-openai,
|
||||
llama-index-vector-stores-chroma,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-cli";
|
||||
version = "0.1.11";
|
||||
version = "0.1.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,12 +20,10 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "llama_index_cli";
|
||||
inherit version;
|
||||
hash = "sha256-XecH4SWqh31wxh2nDMRP6nKp9623f0E7Ufc7He/911A=";
|
||||
hash = "sha256-PPH3BsPGnGsaqwf8p/qtOVnbFwmAjv1QSRtmnTiwtYA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
|
|
@ -36,9 +35,7 @@ buildPythonPackage rec {
|
|||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.cli"
|
||||
];
|
||||
pythonImportsCheck = [ "llama_index.cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex CLI";
|
||||
|
|
@ -46,5 +43,4 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ in
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.29";
|
||||
version = "0.10.30";
|
||||
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-4Tamo5r7EKmLIVymFX9UbFY6vxhgl3dY7xntmDeGn4M=";
|
||||
hash = "sha256-MM7LKZzKohtKJAdFGgORqvSVFhOscbECYkLrANc4aLk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
version = "0.1.18";
|
||||
version = "0.1.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "llama_index_readers_file";
|
||||
inherit version;
|
||||
hash = "sha256-kcmHHoDXyRGk4rsmXuRsPbapPWgbpt33MXUs13ZLNos=";
|
||||
hash = "sha256-GUwbm4XCZRWbcwLH2ArbqTeqsG8FwXCvf9lcTnqK7DU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, impacket
|
||||
, netaddr
|
||||
, poetry-core
|
||||
, pypykatz
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, rich
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
impacket,
|
||||
netaddr,
|
||||
poetry-core,
|
||||
pypykatz,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
rich,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lsassy";
|
||||
version = "3.1.9";
|
||||
version = "3.1.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "Hackndo";
|
||||
repo = "lsassy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VGLSVv/+UpgeSTHoOTjEfQSAYfXA3bAI+yKjcKBI1Z4=";
|
||||
hash = "sha256-Eqparqj1O0gK0MvR4BBkGVNji2WXEnMsdWvKiR6XHFk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
@ -30,13 +31,9 @@ buildPythonPackage rec {
|
|||
"rich"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
impacket
|
||||
|
|
@ -48,9 +45,7 @@ buildPythonPackage rec {
|
|||
# Tests require an active domain controller
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"lsassy"
|
||||
];
|
||||
pythonImportsCheck = [ "lsassy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "19.7.15";
|
||||
version = "19.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-joEAdYJ+W+yqiiAOypEdKkwZQrFfzGvAu6Xg77B4Pss=";
|
||||
hash = "sha256-tFbk33SQqCNcUnJ0X+OtJ8XDEpMXWnuxA2L30Prhssc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, stdenv
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
, ipython
|
||||
, matplotlib
|
||||
, numpy
|
||||
, oldest-supported-numpy
|
||||
, packaging
|
||||
, pytest-randomly
|
||||
, setuptools
|
||||
|
|
@ -33,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.3.9";
|
||||
version = "1.3.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -42,32 +40,23 @@ buildPythonPackage rec {
|
|||
owner = "rasterio";
|
||||
repo = "rasterio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
|
||||
hash = "sha256-FidUaSpbTR8X1/Cqy/IwApkOOl2RRtPqYJaSISRPThI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix tests failing with GDAL 3.8.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rasterio/rasterio/commit/54ec554a6d9ee52207ad17dee42cbc51c613f709.diff";
|
||||
hash = "sha256-Vjt9HRYNAWyj0myMdtSUENbcLjACfzegEClzZb4BxY8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rasterio/rasterio/commit/5a72613c58d1482bf297d08cbacf27992f52b2c4.diff";
|
||||
hash = "sha256-bV6rh3GBmeqq9+Jff2b8/1wOuyF3Iqducu2eN4CT3lM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove useless import statement requiring distutils to be present at the runtime
|
||||
substituteInPlace rasterio/rio/calc.py \
|
||||
--replace-fail "from distutils.version import LooseVersion" ""
|
||||
|
||||
# relax dependency on yet non-packaged, RC version of numpy
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "numpy==2.0.0rc1" "numpy"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
gdal
|
||||
numpy
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
|
@ -104,12 +93,6 @@ buildPythonPackage rec {
|
|||
shapely
|
||||
];
|
||||
|
||||
# rio has runtime dependency on setuptools
|
||||
setuptoolsPythonPath = [ setuptools ];
|
||||
postInstall = ''
|
||||
wrapPythonProgramsIn "$out/bin" "$out $setuptoolsPythonPath"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = ''
|
||||
|
|
@ -118,9 +101,6 @@ buildPythonPackage rec {
|
|||
|
||||
pytestFlagsArray = [
|
||||
"-m 'not network'"
|
||||
|
||||
# pytest.PytestRemovedIn8Warning: Passing None has been deprecated.
|
||||
"-W ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -1,66 +1,73 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, marshmallow-dataclass
|
||||
, poetry-core
|
||||
, pyjwt
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, tabulate
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aioresponses,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
cryptography,
|
||||
dateparser,
|
||||
fetchFromGitHub,
|
||||
marshmallow-dataclass,
|
||||
poetry-core,
|
||||
pyjwt,
|
||||
pythonOlder,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
tabulate,
|
||||
typeguard,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "renault-api";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
repo = "renault-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HDaX94XHkyrIA0hWYwcpUItEIeRK2ACvS6jg1YA6Wv4=";
|
||||
hash = "sha256-FZ1VNO8gEH7HJRu9EVuKIwSQbceG720tCVqAPqHwISQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
click
|
||||
dateparser
|
||||
cryptography
|
||||
marshmallow-dataclass
|
||||
pyjwt
|
||||
tabulate
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
dependencies = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
cli = [
|
||||
click
|
||||
dateparser
|
||||
tabulate
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
typeguard
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--asyncio-mode=auto"
|
||||
];
|
||||
pytestFlagsArray = [ "--asyncio-mode=auto" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"renault_api"
|
||||
];
|
||||
pythonImportsCheck = [ "renault_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interact with the Renault API";
|
||||
mainProgram = "renault-api";
|
||||
homepage = "https://github.com/hacf-fr/renault-api";
|
||||
changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "renault-api";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "shapely";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TWXQqnkQr3Hvpy/WRH4CqOXdRNqBqYPenXNtbmzL5nQ=";
|
||||
hash = "sha256-Xcc2En+scACbjTCaDut08+CJeeUwz3AX8vUH72Lmz7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1130";
|
||||
version = "3.0.1131";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-NstigWCYGfsycosREvaupJ/oIEWfli38lYAq2jClvw4=";
|
||||
hash = "sha256-7VhDVpBcW/uDOvwkCpB+dHrTa+fC7mu6UWuSbnymJgU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,9 +5,9 @@ set -eu -o pipefail
|
|||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
version="2.12.2"
|
||||
version="2.12.3"
|
||||
|
||||
nix-update python311Packages.types-aiobotocore --commit --build
|
||||
#nix-update python312Packages.types-aiobotocore --commit --build
|
||||
|
||||
packages=(
|
||||
types-aiobotocore-alexaforbusiness
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yq";
|
||||
version = "3.3.0";
|
||||
version = "3.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0qtWLxGx4OW5ZUubBtQ/iiBSacx72izgdzJfWhI2Udw=";
|
||||
hash = "sha256-tVjatvFcA+JKHESHiVALINbzB+6cpMk2E4fzZYFjAA0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,47 +1,57 @@
|
|||
{ lib, stdenv, jre, coursier, makeWrapper, installShellFiles, setJavaClassPath }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
jre,
|
||||
coursier,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
setJavaClassPath,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs: {
|
||||
pname = "scalafix";
|
||||
version = "0.12.0";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${finalAttrs.pname}-deps-${finalAttrs.version}";
|
||||
buildCommand = ''
|
||||
export COURSIER_CACHE=$(pwd)
|
||||
${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.13.13:${finalAttrs.version} > deps
|
||||
mkdir -p $out/share/java
|
||||
cp $(< deps) $out/share/java/
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-HMTnr3awTIAgLSl4eF36U1kv162ajJxC5MreSk2TfUE=";
|
||||
};
|
||||
|
||||
let
|
||||
baseName = "scalafix";
|
||||
version = "0.10.0";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${baseName}-deps-${version}";
|
||||
buildCommand = ''
|
||||
export COURSIER_CACHE=$(pwd)
|
||||
${coursier}/bin/cs fetch ch.epfl.scala:scalafix-cli_2.13.8:${version} > deps
|
||||
mkdir -p $out/share/java
|
||||
cp $(< deps) $out/share/java/
|
||||
nativeBuildInputs = [makeWrapper installShellFiles setJavaClassPath];
|
||||
buildInputs = [finalAttrs.deps];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \
|
||||
--add-flags "-cp $CLASSPATH scalafix.cli.Cli"
|
||||
|
||||
installShellCompletion --cmd ${finalAttrs.pname} \
|
||||
--bash <($out/bin/${finalAttrs.pname} --bash) \
|
||||
--zsh <($out/bin/${finalAttrs.pname} --zsh)
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-lDeg90L484MggtQ2a9OyHv4UcfLPjzG3OJZCaWW2AC8=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = baseName;
|
||||
inherit version;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles setJavaClassPath ];
|
||||
buildInputs = [ deps ];
|
||||
passthru.tests = {
|
||||
testVersion = testers.testVersion {
|
||||
program = "${finalAttrs.pname}";
|
||||
version = "${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper ${jre}/bin/java $out/bin/${baseName} \
|
||||
--add-flags "-cp $CLASSPATH scalafix.cli.Cli"
|
||||
|
||||
installShellCompletion --cmd ${baseName} \
|
||||
--bash <($out/bin/${baseName} --bash) \
|
||||
--zsh <($out/bin/${baseName} --zsh)
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/${baseName} --version | grep -q "${version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Refactoring and linting tool for Scala";
|
||||
mainProgram = "scalafix";
|
||||
homepage = "https://scalacenter.github.io/scalafix/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.tomahna ];
|
||||
};
|
||||
}
|
||||
meta = with lib; {
|
||||
description = "Refactoring and linting tool for Scala";
|
||||
mainProgram = "scalafix";
|
||||
homepage = "https://scalacenter.github.io/scalafix/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [maintainers.tomahna];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wails";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wailsapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q=";
|
||||
hash = "sha256-yIoCKnYKky+BlMjGBNRk0lKyxr3UWMdRsvyW2KUItBk=";
|
||||
} + "/v2";
|
||||
|
||||
vendorHash = "sha256-6QFnLuRnSzIqkQkK1qg7VBYxwjK8fSQWz5RxpuyutoY=";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex
|
||||
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
|
||||
, freefont_ttf, makeFontsConf
|
||||
, makeWrapper, t1utils, boehmgc, rsync
|
||||
, makeWrapper, t1utils, boehmgc, rsync, coreutils
|
||||
, texliveSmall, tex ? texliveSmall.withPackages (ps: with ps; [ lh metafont epsf fontinst ])
|
||||
}:
|
||||
|
||||
|
|
@ -19,9 +19,10 @@ stdenv.mkDerivation rec {
|
|||
for f in "$out/bin/"*; do
|
||||
# Override default argv[0] setting so LilyPond can find
|
||||
# its Scheme libraries.
|
||||
wrapProgram "$f" --set GUILE_AUTO_COMPILE 0 \
|
||||
--set PATH "${ghostscript}/bin" \
|
||||
--argv0 "$f"
|
||||
wrapProgram "$f" \
|
||||
--set GUILE_AUTO_COMPILE 0 \
|
||||
--set PATH "${lib.makeBinPath [ ghostscript coreutils (placeholder "out") ]}" \
|
||||
--argv0 "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
# point to this derivations `/dsmi_dir` directory symlink.
|
||||
# Other environment variables might be necessary,
|
||||
# depending on local configuration or usage; see:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.21?topic=solaris-set-api-environment-variables
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.22?topic=solaris-set-api-environment-variables
|
||||
|
||||
|
||||
# The newest version of TSM client should be discoverable by
|
||||
|
|
@ -104,10 +104,10 @@ let
|
|||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
name = "tsm-client-${version}-unwrapped";
|
||||
version = "8.1.21.0";
|
||||
version = "8.1.22.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl version;
|
||||
hash = "sha512-iXkVYQsqbNhQJmrYl5a5433iSl6kg6YzlTlgCzpFGslMn+3ynSmYn8Rtxwitp931SwmV4a53tGctSuisz8pOCg==";
|
||||
hash = "sha512-tsmrnZ0zoGCmpp9ey2K6ad8tMVBgB+lYMTx7YgVOSXNeiGT76fUYdr9DmO+PEsj+J/Pg/skd7ywqsBbjQT+eiw==";
|
||||
};
|
||||
inherit meta passthru;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,45 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nodejs
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jfrog-cli";
|
||||
version = "2.52.10";
|
||||
version = "2.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrog";
|
||||
repo = "jfrog-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sqKlYHOpjIxNff1QK540Xxqr7w+WZ+pZXgfAKjRbMuM=";
|
||||
hash = "sha256-a7zCPyKV9kZ34XxVBYotcMvXUVrieunFpKGBK1Jhvo4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Cm6Wu2U2i6WZfps1WLAjYuVZZ1y7J4WXFLmX2bkevd4=";
|
||||
vendorHash = "sha256-q0PXbLTS5Po3xTK+CkU7BtZ6tk1PfH3zVAVK1IbmitY=";
|
||||
|
||||
# Upgrade the Go version during the vendoring FOD build because it fails otherwise.
|
||||
overrideModAttrs = _: {
|
||||
preBuild = ''
|
||||
substituteInPlace go.mod --replace-fail 'go 1.20' 'go 1.21'
|
||||
'';
|
||||
postInstall = ''
|
||||
cp go.mod "$out/go.mod"
|
||||
'';
|
||||
};
|
||||
|
||||
# Copy the modified go.mod we got from the vendoring process.
|
||||
preBuild = ''
|
||||
cp vendor/go.mod go.mod
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Patch out broken test cleanup.
|
||||
substituteInPlace artifactory_test.go \
|
||||
--replace-fail \
|
||||
'deleteReceivedReleaseBundle(t, "cli-tests", "2")' \
|
||||
'// deleteReceivedReleaseBundle(t, "cli-tests", "2")'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Name the output the same way as the original build script does
|
||||
|
|
@ -24,12 +49,16 @@ buildGoModule rec {
|
|||
# Some of the tests require a writable $HOME
|
||||
preCheck = "export HOME=$TMPDIR";
|
||||
|
||||
nativeCheckInputs = [ nodejs ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jfrog/jfrog-cli";
|
||||
description = "Client for accessing to JFrog's Artifactory and Mission Control through their respective REST APIs";
|
||||
changelog = "https://github.com/jfrog/jfrog-cli/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "jf";
|
||||
maintainers = with maintainers; [ detegr ];
|
||||
maintainers = with maintainers; [ detegr aidalgol ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,28 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wayshot";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "waycrate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-WN1qlV6vpIn0uNiE+rXeQTMscNYqkgFytVBc6gJzvyU=";
|
||||
hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Hfgr+wWC5zUdHhFMwOBt57h2r94OpdJ1MQpckhYgKQQ=";
|
||||
cargoHash = "sha256-1Y9ymodZHtxHzhudjGbkP2ohMaBMOD9K+GpUoNmzHQs=";
|
||||
|
||||
# tests are off as they are broken and pr for integration testing is still WIP
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river";
|
||||
homepage = "https://github.com/waycrate/wayshot";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.dit7ya ];
|
||||
maintainers = with maintainers; [ dit7ya id3v1669 ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "wayshot";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.12.2";
|
||||
version = "1.12.4";
|
||||
|
||||
outputs = [ "out" "mu4e" ];
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ab5nTB7mp9zB53JsPS2aPhbnW4O+56+cWunqTVENMPA=";
|
||||
hash = "sha256-X5rOBDeT0yfnwTKBWQ4F6DTrFZ/dq3BgQBCn9RAQPf4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
, mobile-broadband-provider-info
|
||||
, runtimeShell
|
||||
, buildPackages
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -203,6 +204,9 @@ stdenv.mkDerivation rec {
|
|||
attrPath = "networkmanager";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
tests = {
|
||||
inherit (nixosTests.networking) networkmanager;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ appimageTools, buildFHSEnv, makeDesktopItem, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
|
||||
{ lib
|
||||
, appimageTools
|
||||
, buildFHSEnv
|
||||
, makeDesktopItem
|
||||
, extraPkgs ? pkgs: []
|
||||
, appimage-run-tests ? null
|
||||
}:
|
||||
|
||||
let
|
||||
name = "appimage-run";
|
||||
|
|
@ -14,7 +20,7 @@ let
|
|||
mimeTypes = ["application/vnd.appimage" "application/x-iso9660-appimage"];
|
||||
categories = ["PackageManager" "Utility"];
|
||||
};
|
||||
in buildFHSEnv (fhsArgs // {
|
||||
in buildFHSEnv (lib.recursiveUpdate fhsArgs {
|
||||
inherit name;
|
||||
|
||||
targetPkgs = pkgs: [ appimageTools.appimage-exec ]
|
||||
|
|
@ -26,4 +32,6 @@ in buildFHSEnv (fhsArgs // {
|
|||
'';
|
||||
|
||||
passthru.tests.appimage-run = appimage-run-tests;
|
||||
|
||||
meta.mainProgram = "appimage-run";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, gitleaks
|
||||
, installShellFiles
|
||||
, testers
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gitleaks,
|
||||
installShellFiles,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
|
@ -12,8 +13,8 @@ buildGoModule rec {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "gitleaks";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+UPlknAwmIeXlosHBXl3qPREV186lfDZGZG/Zx1rxYs=";
|
||||
};
|
||||
|
||||
|
|
@ -22,12 +23,10 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}"
|
||||
"-X=github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# With v8 the config tests are are blocking
|
||||
doCheck = false;
|
||||
|
|
|
|||
385
pkgs/tools/security/sequoia-sqv/Cargo.lock.patch
Normal file
385
pkgs/tools/security/sequoia-sqv/Cargo.lock.patch
Normal file
|
|
@ -0,0 +1,385 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index e41780e..15db50e 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -119,11 +119,11 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
-version = "0.57.0"
|
||||
+version = "0.68.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
|
||||
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 2.5.0",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"lazy_static",
|
||||
@@ -134,6 +134,7 @@ dependencies = [
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
+ "syn 2.0.59",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -157,6 +158,12 @@ version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "2.5.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
+
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.9.0"
|
||||
@@ -189,9 +196,9 @@ checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
-version = "0.4.0"
|
||||
+version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
|
||||
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
@@ -243,7 +250,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
"strsim",
|
||||
"term_size",
|
||||
"textwrap",
|
||||
@@ -439,6 +446,16 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
|
||||
|
||||
+[[package]]
|
||||
+name = "errno"
|
||||
+version = "0.3.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "failure"
|
||||
version = "0.1.8"
|
||||
@@ -457,10 +474,16 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "fastrand"
|
||||
+version = "2.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
|
||||
+
|
||||
[[package]]
|
||||
name = "fixedbitset"
|
||||
version = "0.2.0"
|
||||
@@ -609,9 +632,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.109"
|
||||
+version = "0.2.153"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01"
|
||||
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@@ -629,6 +652,12 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
|
||||
|
||||
+[[package]]
|
||||
+name = "linux-raw-sys"
|
||||
+version = "0.4.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
|
||||
+
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.5"
|
||||
@@ -665,6 +694,12 @@ version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af4f95d8737f4ffafbd1fb3c703cdc898868a244a59786793cba0520ebdcbdd"
|
||||
|
||||
+[[package]]
|
||||
+name = "minimal-lexical"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
+
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.4.4"
|
||||
@@ -689,12 +724,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nettle-sys"
|
||||
-version = "2.0.8"
|
||||
+version = "2.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b95aff9e61c8d8132e41dceae74c6e526edcac8d120072c87a300b9ab7e75226"
|
||||
+checksum = "b495053a10a19a80e3a26bf1212e92e29350797b5f5bdc58268c3f3f818e66ec"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
+ "cc",
|
||||
+ "libc",
|
||||
"pkg-config",
|
||||
+ "tempfile",
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
@@ -706,12 +744,12 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
-version = "5.1.2"
|
||||
+version = "7.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
|
||||
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
- "version_check",
|
||||
+ "minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -851,18 +889,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.33"
|
||||
+version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
|
||||
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
- "unicode-xid",
|
||||
+ "unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
-version = "1.0.10"
|
||||
+version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
|
||||
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -909,7 +947,7 @@ version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -951,6 +989,19 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
+[[package]]
|
||||
+name = "rustix"
|
||||
+version = "0.38.32"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.5.0",
|
||||
+ "errno",
|
||||
+ "libc",
|
||||
+ "linux-raw-sys",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.6"
|
||||
@@ -1053,9 +1104,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
-version = "0.1.1"
|
||||
+version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
|
||||
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "signature"
|
||||
@@ -1117,6 +1168,17 @@ dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "2.0.59"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-ident",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "synstructure"
|
||||
version = "0.12.6"
|
||||
@@ -1125,10 +1187,22 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "tempfile"
|
||||
+version = "3.10.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "fastrand",
|
||||
+ "rustix",
|
||||
+ "windows-sys",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.7.0"
|
||||
@@ -1177,7 +1251,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1226,6 +1300,12 @@ version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
|
||||
|
||||
+[[package]]
|
||||
+name = "unicode-ident"
|
||||
+version = "1.0.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
+
|
||||
[[package]]
|
||||
name = "unicode-normalization"
|
||||
version = "0.1.19"
|
||||
@@ -1306,6 +1386,79 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
+[[package]]
|
||||
+name = "windows-sys"
|
||||
+version = "0.52.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+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 = "xxhash-rust"
|
||||
version = "0.8.2"
|
||||
@@ -1329,6 +1482,6 @@ checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.82",
|
||||
"synstructure",
|
||||
]
|
||||
|
|
@ -17,8 +17,9 @@ rustPlatform.buildRustPackage rec {
|
|||
rev = "v${version}";
|
||||
hash = "sha256-KoB9YnPNE2aB5MW5G9r6Bk+1QnANVSKA2dp3ufSJ44M=";
|
||||
};
|
||||
cargoPatches = [ ./Cargo.lock.patch ];
|
||||
|
||||
cargoHash = "sha256-uwOU/yyh3eoD10El7Oe9E97F3dvPuXMHQhpnWEJ1gnI=";
|
||||
cargoHash = "sha256-E6tNOc3omg6yLwCP+MdyBF/HmFTBFCiXd5r+jflfs4k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,34 +1,36 @@
|
|||
{ lib, stdenv, fetchFromGitHub, bison, flex }:
|
||||
{ lib, gccStdenv, fetchFromGitHub, bison, flex, pcre2, libunistring, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "boxes";
|
||||
version = "1.3";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ascii-boxes";
|
||||
repo = "boxes";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b12rsynrmkldlwcb62drk33kk0aqwbj10mq5y5x3hjf626gjwsi";
|
||||
hash = "sha256-/gc/5vDflmEwOtQbtLwRcchyr22rLQcWqs5GrwRxY70=";
|
||||
};
|
||||
|
||||
# Building instructions:
|
||||
# https://boxes.thomasjensen.com/build.html#building-on-linux--unix
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
buildInputs = [ pcre2 libunistring ncurses ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
# Makefile references a system wide config file in '/usr/share'. Instead, we
|
||||
# move it within the store by default.
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "GLOBALCONF = /usr/share/boxes" \
|
||||
--replace-fail "GLOBALCONF = /usr/share/boxes" \
|
||||
"GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
makeFlags = [ "CC=${gccStdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin src/boxes
|
||||
install -Dm755 -t $out/bin out/boxes
|
||||
install -Dm644 -t $out/share/boxes boxes-config
|
||||
install -Dm644 -t $out/share/man/man1 doc/boxes.1
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -20327,6 +20327,7 @@ with pkgs;
|
|||
boost182
|
||||
boost183
|
||||
boost184
|
||||
boost185
|
||||
;
|
||||
|
||||
boost = boost181;
|
||||
|
|
@ -31722,10 +31723,6 @@ with pkgs;
|
|||
|
||||
hexedit = callPackage ../applications/editors/hexedit { };
|
||||
|
||||
himalaya = callPackage ../applications/networking/mailreaders/himalaya {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
|
||||
};
|
||||
|
||||
hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };
|
||||
|
||||
hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix {
|
||||
|
|
|
|||
|
|
@ -10394,13 +10394,13 @@ with self; {
|
|||
|
||||
FinanceQuote = buildPerlPackage rec {
|
||||
pname = "Finance-Quote";
|
||||
version = "1.59";
|
||||
version = "1.60";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz";
|
||||
hash = "sha256-mukoeazGgv9AFuHsqSScjko4y38wHnKio21fIVfxKSg=";
|
||||
hash = "sha256-UXrYQNvOhzdVjnMxNJ/fa7J5u7sMobV+3SN7T5jVw34=";
|
||||
};
|
||||
buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ];
|
||||
propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];
|
||||
propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ];
|
||||
meta = {
|
||||
homepage = "https://finance-quote.sourceforge.net/";
|
||||
changelog = "https://github.com/finance-quote/finance-quote/releases/tag/v${version}";
|
||||
|
|
@ -18606,10 +18606,10 @@ with self; {
|
|||
|
||||
NetDNS = buildPerlPackage {
|
||||
pname = "Net-DNS";
|
||||
version = "1.40";
|
||||
version = "1.44";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.40.tar.gz";
|
||||
hash = "sha256-IJu9QN6NSMG9eq3kjaI3/gpJn4nSebqi4amb1eySLdw=";
|
||||
url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.44.tar.gz";
|
||||
hash = "sha256-E9ftxLjOoBMhR/qsNXH2s8cdHQz9hExTDFoET0o+wx4=";
|
||||
};
|
||||
propagatedBuildInputs = [ DigestHMAC ];
|
||||
makeMakerFlags = [ "--noonline-tests" ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue