Merge master into haskell-updates
This commit is contained in:
commit
575babff62
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
|
@ -37,6 +37,7 @@
|
|||
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde
|
||||
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
|
||||
/pkgs/build-support/cc-wrapper @Ericson2314
|
||||
/pkgs/build-support/bintools-wrapper @Ericson2314
|
||||
|
|
|
@ -119,8 +119,22 @@ rec {
|
|||
# - "composite": a phrase with an "of" connective
|
||||
# See the `optionDescriptionPhrase` function.
|
||||
, descriptionClass ? null
|
||||
, # Function applied to each definition that should return true if
|
||||
# its type-correct, false otherwise.
|
||||
, # DO NOT USE WITHOUT KNOWING WHAT YOU ARE DOING!
|
||||
# Function applied to each definition that must return false when a definition
|
||||
# does not match the type. It should not check more than the root of the value,
|
||||
# because checking nested values reduces laziness, leading to unnecessary
|
||||
# infinite recursions in the module system.
|
||||
# Further checks of nested values should be performed by throwing in
|
||||
# the merge function.
|
||||
# Strict and deep type checking can be performed by calling lib.deepSeq on
|
||||
# the merged value.
|
||||
#
|
||||
# See https://github.com/NixOS/nixpkgs/pull/6794 that introduced this change,
|
||||
# https://github.com/NixOS/nixpkgs/pull/173568 and
|
||||
# https://github.com/NixOS/nixpkgs/pull/168295 that attempted to revert this,
|
||||
# https://github.com/NixOS/nixpkgs/issues/191124 and
|
||||
# https://github.com/NixOS/nixos-search/issues/391 for what happens if you ignore
|
||||
# this disclaimer.
|
||||
check ? (x: true)
|
||||
, # Merge a list of definitions together into a single value.
|
||||
# This function is called with two arguments: the location of
|
||||
|
|
|
@ -8107,6 +8107,12 @@
|
|||
githubId = 42545625;
|
||||
name = "Maas Lalani";
|
||||
};
|
||||
maddiethecafebabe = {
|
||||
email = "maddie@cafebabe.date";
|
||||
github = "maddiethecafebabe";
|
||||
githubId = 75337286;
|
||||
name = "Madeline S.";
|
||||
};
|
||||
madjar = {
|
||||
email = "georges.dubus@compiletoi.net";
|
||||
github = "madjar";
|
||||
|
@ -8591,6 +8597,13 @@
|
|||
fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";
|
||||
}];
|
||||
};
|
||||
meain = {
|
||||
email = "mail@meain.io";
|
||||
matrix = "@meain:matrix.org";
|
||||
github = "meain";
|
||||
githubId = 14259816;
|
||||
name = "Abin Simon";
|
||||
};
|
||||
meatcar = {
|
||||
email = "nixpkgs@denys.me";
|
||||
github = "meatcar";
|
||||
|
@ -9167,6 +9180,12 @@
|
|||
githubId = 15896005;
|
||||
name = "Vladyslav Burzakovskyy";
|
||||
};
|
||||
mrtarantoga = {
|
||||
email = "goetz-dev@web.de";
|
||||
name = "Götz Grimmer";
|
||||
github = "MrTarantoga";
|
||||
githubId = 53876219;
|
||||
};
|
||||
mrVanDalo = {
|
||||
email = "contact@ingolf-wagner.de";
|
||||
github = "mrVanDalo";
|
||||
|
@ -13276,6 +13295,12 @@
|
|||
githubId = 57180880;
|
||||
name = "Ansh Tyagi";
|
||||
};
|
||||
therishidesai = {
|
||||
email = "desai.rishi1@gmail.com";
|
||||
github = "therishidesai";
|
||||
githubId = 5409166;
|
||||
name = "Rishi Desai";
|
||||
};
|
||||
thesola10 = {
|
||||
email = "me@thesola.io";
|
||||
github = "Thesola10";
|
||||
|
|
|
@ -14,6 +14,7 @@ cqueues,,,,,,vcunat
|
|||
cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,,
|
||||
digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3,
|
||||
dkjson,,,,,,
|
||||
fennel,,,,,,misterio77
|
||||
fifo,,,,,,
|
||||
fluent,,,,,,alerque
|
||||
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
|
||||
|
|
|
|
@ -210,6 +210,14 @@
|
|||
<link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/prymitive/kthxbye">kthxbye</link>,
|
||||
an alert acknowledgement management daemon for Prometheus
|
||||
Alertmanager. Available as
|
||||
<link xlink:href="options.html#opt-services.kthxbye.enable">services.kthxbye</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/jtroo/kanata">kanata</link>,
|
||||
|
@ -474,6 +482,14 @@
|
|||
maintainer to update the package.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The (previously undocumented) Nixpkgs configuration option
|
||||
<literal>checkMeta</literal> now defaults to
|
||||
<literal>true</literal>. This may cause evaluation failures
|
||||
for packages with incorrect <literal>meta</literal> attribute.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xow package removed along with the
|
||||
|
|
|
@ -77,6 +77,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle.
|
||||
Available as [services.infnoise](options.html#opt-services.infnoise.enable).
|
||||
|
||||
- [kthxbye](https://github.com/prymitive/kthxbye), an alert acknowledgement management daemon for Prometheus Alertmanager. Available as [services.kthxbye](options.html#opt-services.kthxbye.enable)
|
||||
|
||||
- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization.
|
||||
Available as [services.kanata](options.html#opt-services.kanata.enable).
|
||||
|
||||
|
@ -164,6 +166,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
||||
|
||||
- The (previously undocumented) Nixpkgs configuration option `checkMeta` now defaults to `true`. This may cause evaluation
|
||||
failures for packages with incorrect `meta` attribute.
|
||||
|
||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||
|
||||
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
||||
|
|
|
@ -681,6 +681,7 @@
|
|||
./services/monitoring/heapster.nix
|
||||
./services/monitoring/incron.nix
|
||||
./services/monitoring/kapacitor.nix
|
||||
./services/monitoring/kthxbye.nix
|
||||
./services/monitoring/loki.nix
|
||||
./services/monitoring/longview.nix
|
||||
./services/monitoring/mackerel-agent.nix
|
||||
|
|
|
@ -1279,7 +1279,7 @@ in
|
|||
mr ${pkgs.pam_mount}/lib/security/pam_mount.so,
|
||||
'' +
|
||||
optionalString (isEnabled (cfg: cfg.enableGnomeKeyring)) ''
|
||||
mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so,
|
||||
mr ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so,
|
||||
'' +
|
||||
optionalString (isEnabled (cfg: cfg.startSession)) ''
|
||||
mr ${config.systemd.package}/lib/security/pam_systemd.so,
|
||||
|
|
166
nixos/modules/services/monitoring/kthxbye.nix
Normal file
166
nixos/modules/services/monitoring/kthxbye.nix
Normal file
|
@ -0,0 +1,166 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.kthxbye;
|
||||
in
|
||||
|
||||
{
|
||||
options.services.kthxbye = {
|
||||
enable = mkEnableOption (mdDoc "kthxbye alert acknowledgement management daemon");
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.kthxbye;
|
||||
defaultText = literalExpression "pkgs.kthxbye";
|
||||
description = mdDoc ''
|
||||
The kthxbye package that should be used.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Whether to open ports in the firewall needed for the daemon to function.
|
||||
'';
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
description = mdDoc ''
|
||||
Extra command line options.
|
||||
|
||||
Documentation can be found [here](https://github.com/prymitive/kthxbye/blob/main/README.md).
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
"-extend-with-prefix 'ACK!'"
|
||||
];
|
||||
'';
|
||||
};
|
||||
|
||||
alertmanager = {
|
||||
timeout = mkOption {
|
||||
type = types.str;
|
||||
default = "1m0s";
|
||||
description = mdDoc ''
|
||||
Alertmanager request timeout duration in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format.
|
||||
'';
|
||||
example = "30s";
|
||||
};
|
||||
uri = mkOption {
|
||||
type = types.str;
|
||||
default = "http://localhost:9093";
|
||||
description = mdDoc ''
|
||||
Alertmanager URI to use.
|
||||
'';
|
||||
example = "https://alertmanager.example.com";
|
||||
};
|
||||
};
|
||||
|
||||
extendBy = mkOption {
|
||||
type = types.str;
|
||||
default = "15m0s";
|
||||
description = mdDoc ''
|
||||
Extend silences by adding DURATION seconds.
|
||||
|
||||
DURATION should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format.
|
||||
'';
|
||||
example = "6h0m0s";
|
||||
};
|
||||
|
||||
extendIfExpiringIn = mkOption {
|
||||
type = types.str;
|
||||
default = "5m0s";
|
||||
description = mdDoc ''
|
||||
Extend silences that are about to expire in the next DURATION seconds.
|
||||
|
||||
DURATION should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format.
|
||||
'';
|
||||
example = "1m0s";
|
||||
};
|
||||
|
||||
extendWithPrefix = mkOption {
|
||||
type = types.str;
|
||||
default = "ACK!";
|
||||
description = mdDoc ''
|
||||
Extend silences with comment starting with PREFIX string.
|
||||
'';
|
||||
example = "!perma-silence";
|
||||
};
|
||||
|
||||
interval = mkOption {
|
||||
type = types.str;
|
||||
default = "45s";
|
||||
description = mdDoc ''
|
||||
Silence check interval duration in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format.
|
||||
'';
|
||||
example = "30s";
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = mdDoc ''
|
||||
The address to listen on for HTTP requests.
|
||||
'';
|
||||
example = "127.0.0.1";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8080;
|
||||
description = mdDoc ''
|
||||
The port to listen on for HTTP requests.
|
||||
'';
|
||||
};
|
||||
|
||||
logJSON = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Format logged messages as JSON.
|
||||
'';
|
||||
};
|
||||
|
||||
maxDuration = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = mdDoc ''
|
||||
Maximum duration of a silence, it won't be extended anymore after reaching it.
|
||||
|
||||
Duration should be provided in the [time.Duration](https://pkg.go.dev/time#ParseDuration) format.
|
||||
'';
|
||||
example = "30d";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.kthxbye = {
|
||||
description = "kthxbye Alertmanager ack management daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = ''
|
||||
${cfg.package}/bin/kthxbye \
|
||||
-alertmanager.timeout ${cfg.alertmanager.timeout} \
|
||||
-alertmanager.uri ${cfg.alertmanager.uri} \
|
||||
-extend-by ${cfg.extendBy} \
|
||||
-extend-if-expiring-in ${cfg.extendIfExpiringIn} \
|
||||
-extend-with-prefix ${cfg.extendWithPrefix} \
|
||||
-interval ${cfg.interval} \
|
||||
-listen ${cfg.listenAddress}:${toString cfg.port} \
|
||||
${optionalString cfg.logJSON "-log-json"} \
|
||||
${optionalString (cfg.maxDuration != null) "-max-duration ${cfg.maxDuration}"} \
|
||||
${concatStringsSep " " cfg.extraOptions}
|
||||
'';
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
|
||||
};
|
||||
}
|
|
@ -34,7 +34,7 @@ with lib;
|
|||
|
||||
Either `configFile` or `config` must be specified.
|
||||
|
||||
See <https://www.v2fly.org/en_US/config/overview.html>.
|
||||
See <https://www.v2fly.org/en_US/v5/config/overview.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -56,7 +56,7 @@ with lib;
|
|||
|
||||
Either `configFile` or `config` must be specified.
|
||||
|
||||
See <https://www.v2fly.org/en_US/config/overview.html>.
|
||||
See <https://www.v2fly.org/en_US/v5/config/overview.html>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
@ -71,7 +71,7 @@ with lib;
|
|||
name = "v2ray.json";
|
||||
text = builtins.toJSON cfg.config;
|
||||
checkPhase = ''
|
||||
${cfg.package}/bin/v2ray -test -config $out
|
||||
${cfg.package}/bin/v2ray test -c $out
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -83,13 +83,15 @@ with lib;
|
|||
}
|
||||
];
|
||||
|
||||
environment.etc."v2ray/config.json".source = configFile;
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.v2ray = {
|
||||
description = "v2ray Daemon";
|
||||
after = [ "network.target" ];
|
||||
restartTriggers = [ config.environment.etc."v2ray/config.json".source ];
|
||||
|
||||
# Workaround: https://github.com/NixOS/nixpkgs/issues/81138
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/v2ray -config ${configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -40,14 +40,14 @@ in {
|
|||
|
||||
If the {option}`persistentKeys` is enabled then the
|
||||
keys that are generated during activation will override
|
||||
those in {option}`config` or
|
||||
those in {option}`settings` or
|
||||
{option}`configFile`.
|
||||
|
||||
If no keys are specified then ephemeral keys are generated
|
||||
and the Yggdrasil interface will have a random IPv6 address
|
||||
each time the service is started, this is the default.
|
||||
|
||||
If both {option}`configFile` and {option}`config`
|
||||
If both {option}`configFile` and {option}`settings`
|
||||
are supplied, they will be combined, with values from
|
||||
{option}`configFile` taking precedence.
|
||||
|
||||
|
@ -62,7 +62,7 @@ in {
|
|||
example = "/run/keys/yggdrasil.conf";
|
||||
description = lib.mdDoc ''
|
||||
A file which contains JSON configuration for yggdrasil.
|
||||
See the {option}`config` option for more information.
|
||||
See the {option}`settings` option for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -81,7 +81,7 @@ in {
|
|||
discovery. The NixOS firewall blocks link-local
|
||||
communication, so in order to make local peering work you
|
||||
will also need to set `LinkLocalTCPPort` in your
|
||||
yggdrasil configuration ({option}`config` or
|
||||
yggdrasil configuration ({option}`settings` or
|
||||
{option}`configFile`) to a port number other than 0,
|
||||
and then add that port to
|
||||
{option}`networking.firewall.allowedTCPPorts`.
|
||||
|
|
|
@ -27,7 +27,7 @@ An annotated example of a simple configuration:
|
|||
# The NixOS module will generate new keys and a new IPv6 address each time
|
||||
# it is started if persistentKeys is not enabled.
|
||||
|
||||
config = {
|
||||
settings = {
|
||||
Peers = [
|
||||
# Yggdrasil will automatically connect and "peer" with other nodes it
|
||||
# discovers via link-local multicast annoucements. Unless this is the
|
||||
|
@ -58,7 +58,7 @@ in {
|
|||
services.yggdrasil = {
|
||||
enable = true;
|
||||
persistentKeys = true; # Maintain a fixed public key and IPv6 address.
|
||||
config = {
|
||||
settings = {
|
||||
Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ];
|
||||
NodeInfo = {
|
||||
# This information is visible to the network.
|
||||
|
|
|
@ -252,7 +252,10 @@ in
|
|||
.rabbitmq.url = "${cfg.rabbitmqUrl}"
|
||||
' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json
|
||||
|
||||
if ! psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
|
||||
if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
|
||||
psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql
|
||||
psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql
|
||||
else
|
||||
psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql
|
||||
fi
|
||||
'';
|
||||
|
|
|
@ -277,6 +277,7 @@ in {
|
|||
komga = handleTest ./komga.nix {};
|
||||
krb5 = discoverTests (import ./krb5 {});
|
||||
ksm = handleTest ./ksm.nix {};
|
||||
kthxbye = handleTest ./kthxbye.nix {};
|
||||
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
|
||||
languagetool = handleTest ./languagetool.nix {};
|
||||
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
|
||||
|
|
110
nixos/tests/kthxbye.nix
Normal file
110
nixos/tests/kthxbye.nix
Normal file
|
@ -0,0 +1,110 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
{
|
||||
name = "kthxbye";
|
||||
|
||||
meta = with lib.maintainers; {
|
||||
maintainers = [ nukaduka ];
|
||||
};
|
||||
|
||||
nodes.server = { ... }: {
|
||||
environment.systemPackages = with pkgs; [ prometheus-alertmanager ];
|
||||
services.prometheus = {
|
||||
enable = true;
|
||||
|
||||
globalConfig = {
|
||||
scrape_interval = "5s";
|
||||
scrape_timeout = "5s";
|
||||
evaluation_interval = "5s";
|
||||
};
|
||||
|
||||
scrapeConfigs = [
|
||||
{
|
||||
job_name = "prometheus";
|
||||
scrape_interval = "5s";
|
||||
static_configs = [
|
||||
{
|
||||
targets = [ "localhost:9090" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
rules = [
|
||||
''
|
||||
groups:
|
||||
- name: test
|
||||
rules:
|
||||
- alert: node_up
|
||||
expr: up != 0
|
||||
for: 5s
|
||||
labels:
|
||||
severity: bottom of the barrel
|
||||
annotations:
|
||||
summary: node is fine
|
||||
''
|
||||
];
|
||||
|
||||
alertmanagers = [
|
||||
{
|
||||
static_configs = [
|
||||
{
|
||||
targets = [
|
||||
"localhost:9093"
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
alertmanager = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
configuration.route = {
|
||||
receiver = "test";
|
||||
group_wait = "5s";
|
||||
group_interval = "5s";
|
||||
group_by = [ "..." ];
|
||||
};
|
||||
configuration.receivers = [
|
||||
{
|
||||
name = "test";
|
||||
webhook_configs = [
|
||||
{
|
||||
url = "http://localhost:1234";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.kthxbye = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
extendIfExpiringIn = "30s";
|
||||
logJSON = true;
|
||||
maxDuration = "15m";
|
||||
interval = "5s";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
with subtest("start the server"):
|
||||
start_all()
|
||||
server.wait_for_unit("prometheus.service")
|
||||
server.wait_for_unit("alertmanager.service")
|
||||
server.wait_for_unit("kthxbye.service")
|
||||
|
||||
server.sleep(2) # wait for units to settle
|
||||
server.systemctl("restart kthxbye.service") # make sure kthxbye comes up after alertmanager
|
||||
server.sleep(2)
|
||||
|
||||
with subtest("set up test silence which expires in 20s"):
|
||||
server.succeed('amtool --alertmanager.url "http://localhost:9093" silence add alertname="node_up" -a "nixosTest" -d "20s" -c "ACK! this server is fine!!"')
|
||||
|
||||
with subtest("wait for 21 seconds and check if the silence is still active"):
|
||||
server.sleep(21)
|
||||
server.systemctl("status kthxbye.service")
|
||||
server.succeed("amtool --alertmanager.url 'http://localhost:9093' silence | grep 'ACK'")
|
||||
'';
|
||||
})
|
|
@ -20,7 +20,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
|
|||
port = 1081;
|
||||
listen = "127.0.0.1";
|
||||
protocol = "vmess";
|
||||
settings.clients = [v2rayUser];
|
||||
settings.clients = [ v2rayUser ];
|
||||
}
|
||||
];
|
||||
outbounds = [
|
||||
|
@ -30,7 +30,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
|
|||
settings.vnext = [{
|
||||
address = "127.0.0.1";
|
||||
port = 1081;
|
||||
users = [v2rayUser];
|
||||
users = [ v2rayUser ];
|
||||
}];
|
||||
}
|
||||
{
|
||||
|
@ -49,6 +49,14 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let
|
|||
inboundTag = "vmess_in";
|
||||
outboundTag = "direct";
|
||||
}
|
||||
|
||||
# Assert assets "geoip" and "geosite" are accessible.
|
||||
{
|
||||
type = "field";
|
||||
ip = [ "geoip:private" ];
|
||||
domain = [ "geosite:category-ads" ];
|
||||
outboundTag = "direct";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
From fbf2ddd872db6a3640bc7d693356b99be9dd70f5 Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <christoph.neidahl@gmail.com>
|
||||
Date: Thu, 18 Aug 2022 20:12:07 +0200
|
||||
Subject: [PATCH] Remove FetchContent usage
|
||||
|
||||
---
|
||||
CMakeLists.txt | 27 +++++----------------------
|
||||
1 file changed, 5 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 84c66a7..5234903 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -30,20 +30,9 @@ project(Fire VERSION 0.9.9)
|
||||
# or
|
||||
# add_subdirectory(JUCE) # If you've put JUCE in a subdirectory called JUCE
|
||||
|
||||
-include(FetchContent)
|
||||
-FetchContent_Declare(
|
||||
- JUCE
|
||||
- GIT_REPOSITORY https://github.com/juce-framework/JUCE.git
|
||||
- GIT_TAG 7.0.1
|
||||
-)
|
||||
-FetchContent_MakeAvailable(JUCE)
|
||||
-
|
||||
-FetchContent_Declare(
|
||||
- readerwriterqueue
|
||||
- GIT_REPOSITORY https://github.com/cameron314/readerwriterqueue
|
||||
- GIT_TAG v1.0.6
|
||||
-)
|
||||
-FetchContent_MakeAvailable(readerwriterqueue)
|
||||
+add_subdirectory(JUCE EXCLUDE_FROM_ALL)
|
||||
+
|
||||
+add_subdirectory(readerwriterqueue EXCLUDE_FROM_ALL)
|
||||
|
||||
# If you are building a VST2 or AAX plugin, CMake needs to be told where to find these SDKs on your
|
||||
# system. This setup should be done before calling `juce_add_plugin`.
|
||||
@@ -172,13 +161,7 @@ set(TestFiles
|
||||
test/CatchMain.cpp
|
||||
test/PluginTest.cpp)
|
||||
|
||||
-# Download the tagged version of Catch2
|
||||
-Include(FetchContent)
|
||||
-FetchContent_Declare(
|
||||
- Catch2
|
||||
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
- GIT_TAG v2.13.7)
|
||||
-FetchContent_MakeAvailable(Catch2)
|
||||
+add_subdirectory(Catch2 EXCLUDE_FROM_ALL)
|
||||
|
||||
# Setup the test executable, again C++ 20 please
|
||||
add_executable(Tests ${TestFiles})
|
||||
@@ -199,4 +182,4 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/test PREFIX "" FILES ${TestFiles})
|
||||
# We have to manually provide the source directory here for now
|
||||
# https://github.com/catchorg/Catch2/issues/2026
|
||||
include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake)
|
||||
-catch_discover_tests(Tests)
|
||||
\ No newline at end of file
|
||||
+catch_discover_tests(Tests)
|
||||
--
|
||||
2.36.0
|
||||
|
117
pkgs/applications/audio/fire/default.nix
Normal file
117
pkgs/applications/audio/fire/default.nix
Normal file
|
@ -0,0 +1,117 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, catch2
|
||||
, libX11
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXext
|
||||
, libXcursor
|
||||
, freetype
|
||||
, alsa-lib
|
||||
, Cocoa
|
||||
, WebKit
|
||||
, CoreServices
|
||||
, DiscRecording
|
||||
, CoreAudioKit
|
||||
, MetalKit
|
||||
, simd
|
||||
}:
|
||||
|
||||
let
|
||||
# FetchContent replacement, check CMakeLists.txt for requested versions (Nixpkgs' Catch2 works)
|
||||
readerwriterqueue = fetchFromGitHub {
|
||||
owner = "cameron314";
|
||||
repo = "readerwriterqueue";
|
||||
rev = "v1.0.6";
|
||||
sha256 = "sha256-g7NX7Ucl5GWw3u6TiUOITjhv7492ByTzACtWR0Ph2Jc=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fire";
|
||||
version = "1.0.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jerryuhoo";
|
||||
repo = "Fire";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Remove-FetchContent-usage.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# 1. Remove hardcoded LTO flags: needs extra setup on Linux,
|
||||
# possibly broken on Darwin
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
# 2. Disable automatic copying of built plugins during buildPhase, it defaults
|
||||
# into user home and we want to have building & installing separated.
|
||||
sed -i \
|
||||
-e '/juce::juce_recommended_lto_flags/d' \
|
||||
-e 's/COPY_PLUGIN_AFTER_BUILD TRUE/COPY_PLUGIN_AFTER_BUILD FALSE/g' \
|
||||
CMakeLists.txt
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
ln -s ${readerwriterqueue} readerwriterqueue
|
||||
ln -s ${catch2.src} Catch2
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXext
|
||||
libXcursor
|
||||
freetype
|
||||
alsa-lib
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Cocoa
|
||||
WebKit
|
||||
CoreServices
|
||||
DiscRecording
|
||||
CoreAudioKit
|
||||
MetalKit
|
||||
simd
|
||||
];
|
||||
|
||||
installPhase = let
|
||||
vst3Dir = "${placeholder "out"}/${if stdenv.hostPlatform.isDarwin then "Library/Audio/Plug-Ins/VST3" else "lib/vst3"}";
|
||||
auDir = "${placeholder "out"}/Library/Audio/Plug-Ins/Components";
|
||||
in ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p ${vst3Dir}
|
||||
# Exact path of the build artefact depends on used CMAKE_BUILD_TYPE
|
||||
cp -R Fire_artefacts/*/VST3/* ${vst3Dir}/
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p ${auDir}
|
||||
cp -R Fire_artefacts/*/AU/* ${auDir}/
|
||||
'' + ''
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Fails to find fp.h on its own
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/";
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-band distortion plugin by Wings";
|
||||
homepage = "https://github.com/jerryuhoo/Fire";
|
||||
license = licenses.agpl3Only; # Not clarified if Only or Plus
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
};
|
||||
}
|
|
@ -6,12 +6,12 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "miniplayer";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JUlUFj/5DOTLa1XCZX/9Nj3Z9W+k4gnpJONiS4qNBIU=";
|
||||
hash = "sha256-NrIDv61mRDe9JWpSP8cvlU4CGoN6Ou6XuNOIn1p47Pw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "4.1.2";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "sha256-HurREfN4VxhFiyP+oAx8QeTfoZTk+PlRX5pVWyU+Dwg=";
|
||||
sha256 = "sha256-YydpWzGH+Orb8Vot8hchh+FFcd327VwQ8Kr7x8WYnv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
|
|
@ -5625,6 +5625,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/scalameta/nvim-metals/";
|
||||
};
|
||||
|
||||
nvim-moonwalk = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-moonwalk";
|
||||
version = "2022-04-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpanders";
|
||||
repo = "nvim-moonwalk";
|
||||
rev = "86a59f16ae01606824cef3d0f3f87c9886b312d0";
|
||||
sha256 = "0cwfsm5wb4qn04930km9p4i6xbhaw4023dfzw3s6cr6a428rpc5j";
|
||||
};
|
||||
meta.homepage = "https://github.com/gpanders/nvim-moonwalk/";
|
||||
};
|
||||
|
||||
nvim-neoclip-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-neoclip.lua";
|
||||
version = "2022-09-23";
|
||||
|
|
|
@ -473,6 +473,7 @@ https://github.com/neovim/nvim-lspconfig/,,
|
|||
https://github.com/RishabhRD/nvim-lsputils/,,
|
||||
https://github.com/rafcamlet/nvim-luapad/,,
|
||||
https://github.com/scalameta/nvim-metals/,,
|
||||
https://github.com/gpanders/nvim-moonwalk/,,
|
||||
https://github.com/AckslD/nvim-neoclip.lua/,,
|
||||
https://github.com/yamatsum/nvim-nonicons/,,
|
||||
https://github.com/rcarriga/nvim-notify/,,
|
||||
|
|
|
@ -1,12 +1,52 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
|
||||
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
|
||||
, libXrandr, libusb1, libpthreadstubs, libXext, libXxf86vm, libXinerama
|
||||
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib
|
||||
, miniupnpc, enet, mbedtls, soundtouch, sfml, xz, writeScript
|
||||
, vulkan-loader ? null, libpulseaudio ? null
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, bluez
|
||||
, ffmpeg
|
||||
, libGL
|
||||
, libXrandr
|
||||
, libusb1
|
||||
, libXext
|
||||
, openal
|
||||
, udev
|
||||
, libevdev
|
||||
, curl
|
||||
, alsa-lib
|
||||
, miniupnpc
|
||||
, enet
|
||||
, mbedtls
|
||||
, soundtouch
|
||||
, sfml
|
||||
, xz
|
||||
, hidapi
|
||||
, fmt_8
|
||||
, vulkan-loader
|
||||
, libpulseaudio
|
||||
, bzip2
|
||||
, libiconv
|
||||
, pugixml
|
||||
, xxHash
|
||||
|
||||
# - Inputs used for Darwin
|
||||
, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
|
||||
# Used in passthru
|
||||
, testers
|
||||
, dolphin-emu-beta
|
||||
, writeShellScript
|
||||
, common-updater-scripts
|
||||
, jq
|
||||
|
||||
# Darwin-only dependencies
|
||||
, CoreBluetooth
|
||||
, ForceFeedback
|
||||
, IOKit
|
||||
, VideoToolbox
|
||||
, OpenGL
|
||||
, libpng
|
||||
, moltenvk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
|
@ -20,27 +60,70 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ]
|
||||
++ lib.optional stdenv.isLinux wrapQtAppsHook;
|
||||
patches = [
|
||||
# On x86_64-darwin CMake reportedly does not work without this in some cases.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765
|
||||
./minizip-external-missing-include.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
|
||||
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp
|
||||
portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml xz
|
||||
curl
|
||||
ffmpeg
|
||||
pugixml
|
||||
xxHash
|
||||
libGL
|
||||
libpulseaudio
|
||||
openal
|
||||
libusb1
|
||||
libiconv
|
||||
libpng
|
||||
hidapi
|
||||
miniupnpc
|
||||
enet
|
||||
mbedtls
|
||||
soundtouch
|
||||
sfml
|
||||
xz
|
||||
qtbase
|
||||
fmt_8
|
||||
bzip2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bluez udev libevdev alsa-lib vulkan-loader
|
||||
libXrandr
|
||||
libXext
|
||||
bluez
|
||||
udev
|
||||
libevdev
|
||||
alsa-lib
|
||||
vulkan-loader
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreBluetooth OpenGL ForceFeedback IOKit
|
||||
CoreBluetooth
|
||||
OpenGL
|
||||
ForceFeedback
|
||||
IOKit
|
||||
VideoToolbox
|
||||
moltenvk
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDISTRIBUTOR=NixOS"
|
||||
"-DUSE_SHARED_ENET=ON"
|
||||
"-DDOLPHIN_WC_REVISION=${src.rev}"
|
||||
"-DDOLPHIN_WC_DESCRIBE=${version}"
|
||||
"-DDOLPHIN_WC_BRANCH=master"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOSX_USE_DEFAULT_SEARCH_PATH=True"
|
||||
"-DUSE_BUNDLED_MOLTENVK=OFF"
|
||||
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
|
||||
"-DSKIP_POSTPROCESS_BUNDLE=ON"
|
||||
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
|
||||
# Note: The updater isn't available on linux, so we dont need to disable it there.
|
||||
"-DENABLE_AUTOUPDATE=OFF"
|
||||
];
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
|
@ -50,37 +133,51 @@ stdenv.mkDerivation rec {
|
|||
"--set QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
# - Allow Dolphin to use nix-provided libraries instead of building them
|
||||
postPatch = ''
|
||||
sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
|
||||
sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \
|
||||
CMakeLists.txt
|
||||
# Use nix-provided libraries instead of submodules
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "if(NOT APPLE)" "if(true)" \
|
||||
--replace "if(LIBUSB_FOUND AND NOT APPLE)" "if(LIBUSB_FOUND)"
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Only gets installed automatically if the standalone executable is used
|
||||
mkdir -p $out/Applications
|
||||
cp -r ./Binaries/Dolphin.app $out/Applications
|
||||
ln -s $out/Applications/Dolphin.app/Contents/MacOS/Dolphin $out/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = dolphin-emu-beta;
|
||||
command = "dolphin-emu-nogui --version";
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "dolphin-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
set -eou pipefail
|
||||
json="$(curl -s https://dolphin-emu.org/update/latest/beta)"
|
||||
version="$(jq -r '.shortrev' <<< "$json")"
|
||||
rev="$(jq -r '.hash' <<< "$json")"
|
||||
update-source-version dolphin-emu-beta "$version" --rev="$rev"
|
||||
'';
|
||||
updateScript = writeShellScript "dolphin-update-script" ''
|
||||
set -eou pipefail
|
||||
export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]}
|
||||
|
||||
json="$(curl -s https://dolphin-emu.org/update/latest/beta)"
|
||||
version="$(jq -r '.shortrev' <<< "$json")"
|
||||
rev="$(jq -r '.hash' <<< "$json")"
|
||||
update-source-version dolphin-emu-beta "$version" --rev="$rev"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://dolphin-emu.org";
|
||||
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ MP2E ashkitten xfix ];
|
||||
mainProgram = "Dolphin";
|
||||
branch = "master";
|
||||
broken = stdenv.isDarwin;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
MP2E
|
||||
ashkitten
|
||||
xfix
|
||||
ivar
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
commit 5e0cb8066fb1653399c54e93e42375295c2562bd
|
||||
Author: Ivar Scholten <ivar.scholten@protonmail.com>
|
||||
Date: Fri Sep 9 14:27:55 2022 +0200
|
||||
|
||||
Externals/minizip: add missing include to CheckFunctionExists
|
||||
|
||||
diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt
|
||||
index c3d7c5512e..f59f8b295c 100644
|
||||
--- a/Externals/minizip/CMakeLists.txt
|
||||
+++ b/Externals/minizip/CMakeLists.txt
|
||||
@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H)
|
||||
target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H)
|
||||
endif()
|
||||
|
||||
+include(CheckFunctionExists)
|
||||
check_function_exists(fseeko HAVE_FSEEKO)
|
||||
if (NOT HAVE_FSEEKO)
|
||||
target_compile_definitions(minizip PRIVATE NO_FSEEKO)
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsx2";
|
||||
version = "1.7.3165";
|
||||
version = "1.7.3331";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "pcsx2";
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FdLmLZLpS8zPmHVn4k0nE6vS/omYVIOal9ej0h3bE/Y=";
|
||||
hash = "sha256-0RcmBMxKj/gnkNEjn2AUSSO1DzyNSf1lOZWPSUq6764=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
@ -79,13 +79,9 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
# Wayland doesn't seem to work right now (crashes when booting a game).
|
||||
# Try removing `--prefix GDK_BACKEND : x11` on the next update.
|
||||
# (This may be solved when the project finshes migrating to Qt)
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
|
||||
--prefix GDK_BACKEND : x11
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
77
pkgs/applications/gis/spatialite-gui/default.nix
Normal file
77
pkgs/applications/gis/spatialite-gui/default.nix
Normal file
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, desktopToDarwinBundle
|
||||
, curl
|
||||
, freexl
|
||||
, geos
|
||||
, librasterlite2
|
||||
, librttopo
|
||||
, libspatialite
|
||||
, libwebp
|
||||
, libxlsxwriter
|
||||
, libxml2
|
||||
, lz4
|
||||
, minizip
|
||||
, openjpeg
|
||||
, postgresql
|
||||
, proj
|
||||
, sqlite
|
||||
, virtualpg
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, zstd
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spatialite-gui";
|
||||
version = "2.1.0-beta1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/spatialite_gui-${version}.tar.gz";
|
||||
hash = "sha256-ukjZbfGM68P/I/aXlyB64VgszmL0WWtpuuMAyjwj2zM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ lib.optional stdenv.isDarwin desktopToDarwinBundle;
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
freexl
|
||||
geos
|
||||
librasterlite2
|
||||
librttopo
|
||||
libspatialite
|
||||
libwebp
|
||||
libxlsxwriter
|
||||
libxml2
|
||||
lz4
|
||||
minizip
|
||||
openjpeg
|
||||
postgresql
|
||||
proj
|
||||
sqlite
|
||||
virtualpg
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isLinux wxGTK
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
rm -fr $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical user interface for SpatiaLite";
|
||||
homepage = "https://www.gaia-gis.it/fossil/spatialite_gui";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
mainProgram = "spatialite_gui";
|
||||
};
|
||||
}
|
|
@ -30,6 +30,7 @@
|
|||
, wayland
|
||||
, wayland-protocols
|
||||
, qtwayland
|
||||
, cairo
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -61,7 +62,7 @@ mkDerivation rec {
|
|||
buildInputs = [
|
||||
eigen boost glew opencsg cgal mpfr gmp glib
|
||||
harfbuzz lib3mf libzip double-conversion freetype fontconfig
|
||||
qtbase qtmultimedia qscintilla
|
||||
qtbase qtmultimedia qscintilla cairo
|
||||
] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ]
|
||||
++ lib.optional stdenv.isDarwin qtmacextras
|
||||
++ lib.optional spacenavSupport libspnav
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }:
|
||||
let
|
||||
pname = "keeweb";
|
||||
version = "1.18.6";
|
||||
version = "1.18.7";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage";
|
||||
sha256 = "sha256-hxXs8Dfh5YQy1zaFb20KDWNl8eqFjuN5QY7tsO6+E/U=";
|
||||
hash = "sha256-W3Dfo7YZfLObodAS7ZN3jqnYzLNAnjJIfJC6il5THwY=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
|
||||
sha256 = "sha256-8+7NzaHVcLinKb57SAcJmF2Foy9RfxFhcTxzvL0JSJQ=";
|
||||
hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg";
|
||||
sha256 = "sha256-1BNY6kRS0F+AUI+80ZGFi/ek28NMP1uexo1UORz5D6g=";
|
||||
hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system};
|
||||
|
@ -28,6 +28,7 @@ let
|
|||
description = "Free cross-platform password manager compatible with KeePass";
|
||||
homepage = "https://keeweb.info/";
|
||||
changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = builtins.attrNames srcs;
|
||||
|
@ -44,7 +45,7 @@ let
|
|||
install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps
|
||||
install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime
|
||||
substituteInPlace $out/share/applications/keeweb.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
--replace "Exec=AppRun" "Exec=$out/bin/${pname}"
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamdeck-ui";
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "timothycrosley";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NV4BkHEgfxIOuLfmn0vcPNqivmHLD6v7jLdLZgnrb0Q=";
|
||||
sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8=";
|
||||
};
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
|
@ -33,11 +33,7 @@ python3Packages.buildPythonApplication rec {
|
|||
postInstall =
|
||||
let
|
||||
udevRules = ''
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", TAG+="uaccess"
|
||||
SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", TAG+="uaccess"
|
||||
'';
|
||||
in
|
||||
''
|
||||
|
|
|
@ -102,13 +102,13 @@
|
|||
"version": "2.24.0"
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-v+ye1qynG958XHvAcg954toIjVHIyoa5dcKXUB8zi8E=",
|
||||
"hash": "sha256-nIFfPAuRZv+deLHDhOhl27TcIkVFIrI704RmlK9fH38=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.31.0",
|
||||
"vendorHash": "sha256-99iNQPVOhuKOGq2VRExm6y6Ab/NzaRmJxwRJfmkYycM=",
|
||||
"version": "4.31.0"
|
||||
"rev": "v4.32.0",
|
||||
"vendorHash": "sha256-qnh28bbG5k6jMUepcxtgDWk1DptQiXjkg702QtYIM28=",
|
||||
"version": "4.32.0"
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-r7trdPrlvZ5rW75L7AEkG1baQaLMXnZ48Axi552nPIM=",
|
||||
|
@ -120,13 +120,13 @@
|
|||
"version": "2.28.1"
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-gUZTP2oOGAv75pBjLHs3mFBuzEFn7oqnAJw7S3SBWb0=",
|
||||
"hash": "sha256-5HMy28/AnUH+18i5eBm1OjQZElvrXsWd6jwQteFCpR4=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.23.0",
|
||||
"rev": "v3.24.0",
|
||||
"vendorHash": null,
|
||||
"version": "3.23.0"
|
||||
"version": "3.24.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
|
||||
|
@ -139,13 +139,13 @@
|
|||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-uKq0mgIhoV5tszbK944DfZRDsqteDtaE0fI+75o79Cc=",
|
||||
"hash": "sha256-0tu+WwL5aZVhmQs30KwY7ctlPqhcYb179QVLI3wGedw=",
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.15.8",
|
||||
"rev": "v1.15.9",
|
||||
"vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=",
|
||||
"version": "1.15.8"
|
||||
"version": "1.15.9"
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-fh1RRl+NLKTLLFUGK5gkWqWMCzUwHBFk69Tc0JIuFgs=",
|
||||
|
@ -269,13 +269,13 @@
|
|||
"version": "0.4.5"
|
||||
},
|
||||
"consul": {
|
||||
"hash": "sha256-QX0f9yM408HfdGNIpmkAKFUz0RfH90V4WBt1Hnwzoy8=",
|
||||
"hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=",
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/consul",
|
||||
"repo": "terraform-provider-consul",
|
||||
"rev": "v2.15.1",
|
||||
"vendorHash": null,
|
||||
"version": "2.15.1"
|
||||
"rev": "v2.16.2",
|
||||
"vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=",
|
||||
"version": "2.16.2"
|
||||
},
|
||||
"ct": {
|
||||
"hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=",
|
||||
|
@ -368,13 +368,13 @@
|
|||
"version": "1.9.0"
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-yjpO36B5r4//2ytPe4pwvQ5A8r4hF3nL6M7/SRI0Ml8=",
|
||||
"hash": "sha256-d+CMg3wYHsOYow8LG7P+qcszUBiCbNwEp1zCJN7yZKo=",
|
||||
"owner": "exoscale",
|
||||
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.40.2",
|
||||
"rev": "v0.41.0",
|
||||
"vendorHash": null,
|
||||
"version": "0.40.2"
|
||||
"version": "0.41.0"
|
||||
},
|
||||
"external": {
|
||||
"hash": "sha256-gImRxsDUgBHmw/5DeKcO9BzB906JB8dUcSGKQj+Vcy0=",
|
||||
|
@ -424,13 +424,13 @@
|
|||
"version": "2.1.0"
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-wslz9Nf4f1g9dkZYXhE6Xvg/rNOgGKuv/gh1SfP4/co=",
|
||||
"hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=",
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.2.0",
|
||||
"rev": "v5.3.0",
|
||||
"vendorHash": null,
|
||||
"version": "5.2.0"
|
||||
"version": "5.3.0"
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=",
|
||||
|
@ -471,13 +471,13 @@
|
|||
"version": "0.7.0"
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-iUo7fhUDklFy6pSoZUe2ymEbRbf69dxirASFwSBmJvc=",
|
||||
"hash": "sha256-ccU2jj/0bpKpu/YxJOtPONup0W10OP3O0iRMVayvGVM=",
|
||||
"owner": "grafana",
|
||||
"provider-source-address": "registry.terraform.io/grafana/grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.28.2",
|
||||
"vendorHash": "sha256-YEkJgNtF7I1ofNjRBaIa6u/KFQZcxpR0+uBf+5D5FiM=",
|
||||
"version": "1.28.2"
|
||||
"rev": "v1.29.0",
|
||||
"vendorHash": "sha256-oswrLzRQkXiwmjtP8xBGCaKSurbXyvZkSF4zoj0WPcw=",
|
||||
"version": "1.29.0"
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=",
|
||||
|
@ -779,13 +779,13 @@
|
|||
"version": "0.6.12"
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-qTXnS7ZBHD33W0gcCNnq/Zg99l58Hb+dDl2Ck5wKl8Q=",
|
||||
"hash": "sha256-xh7ufhv0zHTHS1aMz15PKlKoNPSDhXOIeSxj6tvRKKo=",
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.2.1",
|
||||
"rev": "v3.3.0",
|
||||
"vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=",
|
||||
"version": "3.2.1"
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=",
|
||||
|
@ -834,13 +834,13 @@
|
|||
"version": "1.7.1"
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-xFDdEGa170VPxDOteLnerF+QGHbQP+3+RL4qEPWkUHo=",
|
||||
"hash": "sha256-qB/sRPvX+srpySJPDWxoZviVFtbVTK9hwAR6D4pyjmc=",
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.93.0",
|
||||
"rev": "v4.94.0",
|
||||
"vendorHash": null,
|
||||
"version": "4.93.0"
|
||||
"version": "4.94.0"
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-rgDBZsbXBzBcDgVoaFkPD27Ezef9J23oqtBJAHqJrrE=",
|
||||
|
@ -879,22 +879,22 @@
|
|||
"version": "1.48.0"
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-gjHRzDyxD9DA0k9H1gfEkFZ3nTzxXUkrCmAJ0CXLEwc=",
|
||||
"hash": "sha256-X4e74tgqHbt9j5prq2Zjqbcmwvr6m1UDFp5y1xfwkEQ=",
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.31.3",
|
||||
"vendorHash": "sha256-MGtxmZwo+Av6c7KPUzjSLoizVXbS3TltGxjoCUbeEb0=",
|
||||
"version": "1.31.3"
|
||||
"rev": "v1.31.4",
|
||||
"vendorHash": "sha256-ARlkXkty4/h86cmWnmKnP1Vhzt7oTOOxSFraNGp2BWs=",
|
||||
"version": "1.31.4"
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-IoN7z8/ZPEr6pW7vnDjY65+gAtncV1fr+YsnggSZuZA=",
|
||||
"hash": "sha256-hdLKa2usoDedzOlzPQrADJOqIxtANqTeTamn/DakRh4=",
|
||||
"owner": "opsgenie",
|
||||
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.14",
|
||||
"rev": "v0.6.15",
|
||||
"vendorHash": null,
|
||||
"version": "0.6.14"
|
||||
"version": "0.6.15"
|
||||
},
|
||||
"ovh": {
|
||||
"hash": "sha256-DHk1AUxHuXLrPiRhfAtJDDNT4TYH1XsUzBqjKGvPK7c=",
|
||||
|
@ -996,13 +996,13 @@
|
|||
"version": "0.4.3"
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-bYy3bTn5mFbu0Y7hy7KY2ZkU2xMC0HgBRRh7cxT/A9s=",
|
||||
"hash": "sha256-EPbh9lUcamFe33EKj2TzzaKChOU8fQb5/uigln2ALJ8=",
|
||||
"owner": "scaleway",
|
||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.2.9",
|
||||
"vendorHash": "sha256-Jg1FalV+WsKYOZpszeNYydP4Qtf2cdaZt7xz4O699wc=",
|
||||
"version": "2.2.9"
|
||||
"rev": "v2.3.0",
|
||||
"vendorHash": "sha256-C4viIkYpu9B79kDByyg8cTCsXW6fGued280kIPAYHjc=",
|
||||
"version": "2.3.0"
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
|
@ -1059,13 +1059,13 @@
|
|||
"version": "0.14.5"
|
||||
},
|
||||
"snowflake": {
|
||||
"hash": "sha256-RmCmiQKVNAQexYKFp9shbfPbWUFlJSTCOFUcgADyJg4=",
|
||||
"hash": "sha256-1aHhiZhswlLzEBkvjFQI7jLPAX2/KLxE0oKLspnRtQI=",
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.44.0",
|
||||
"rev": "v0.45.0",
|
||||
"vendorHash": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=",
|
||||
"version": "0.44.0"
|
||||
"version": "0.45.0"
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
|
||||
|
@ -1113,13 +1113,13 @@
|
|||
"version": "2.19.0"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-Sn58Xyj0UoVX7YfuLyuUVGrPEWYOH0O5YoTk8vYQQVA=",
|
||||
"hash": "sha256-aC/KtMOl5Ldrlme9Bd4E4UQSLVsKFsJbsL9KMGDmJbo=",
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.77.11",
|
||||
"rev": "v1.78.0",
|
||||
"vendorHash": null,
|
||||
"version": "1.77.11"
|
||||
"version": "1.78.0"
|
||||
},
|
||||
"tfe": {
|
||||
"hash": "sha256-DRbJ1ZmYMkEncZHE12uLcNHhbSnxvyG3IYqlUsxs+pI=",
|
||||
|
@ -1186,13 +1186,13 @@
|
|||
"version": "1.32.2"
|
||||
},
|
||||
"utils": {
|
||||
"hash": "sha256-KgQnccuNEppJsSF+mddkss1uFCsfx2egdNffQ8a/6Pg=",
|
||||
"hash": "sha256-FYOu48Bg8iMfNl+2EETBMxEfwg2ToO+Oexz1yPi0g38=",
|
||||
"owner": "cloudposse",
|
||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||
"repo": "terraform-provider-utils",
|
||||
"rev": "1.1.0",
|
||||
"vendorHash": "sha256-tiujJ9jqTHQtxyYo8HKEKETpcRmfXR6cObBKmB8YzfE=",
|
||||
"version": "1.1.0"
|
||||
"rev": "1.2.0",
|
||||
"vendorHash": "sha256-eDNA4zvOYnWvaCHhNHWOjy1VstG1nITWkCMOilu9Wxg=",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-fEITfA3XXyUiILPse7fOmBW8M6dzEIUMg+7b3l4z2vo=",
|
||||
|
@ -1276,12 +1276,12 @@
|
|||
"version": "3.2.0"
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-fnN1Gghgwbbxz8WWr/RJi59+SI+0th4NdB59l+3aVVY=",
|
||||
"hash": "sha256-h8uMN08lwpG8gnCd4jnz/+eIfJEQnZcexW/THYLM4/8=",
|
||||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.79.0",
|
||||
"rev": "v0.80.0",
|
||||
"vendorHash": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=",
|
||||
"version": "0.79.0"
|
||||
"version": "0.80.0"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,19 +23,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fractal-next";
|
||||
version = "unstable-2022-09-09";
|
||||
version = "5-alpha1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "fractal";
|
||||
rev = "5f0a4b48a745ccce202d14e7d02e14f51598fb42";
|
||||
hash = "sha256-7s2ytHpM5pZ0dhnVMA8KDWIBaSWds7t9GB6Wav+0dQA=";
|
||||
rev = version;
|
||||
hash = "sha256-gHMfBGrq3HiGeqHx2knuc9LomgIW9QA9fCSCcQncvz0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
hash = "sha256-CJD9YmL06ELR3X/gIrsVCpDyJnWPbH/JF4HlXvWjiZ8=";
|
||||
hash = "sha256-fTETUD/OaOati5HvNxto5Cw26wMclt6mxPLm4cyE3+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,82 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, autoPatchelfHook
|
||||
, pango
|
||||
, gtk3
|
||||
, alsa-lib
|
||||
, nss
|
||||
, libXdamage
|
||||
, libdrm
|
||||
, mesa
|
||||
, libxshmfence
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, gcc-unwrapped
|
||||
, udev
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluemail";
|
||||
version = "1.131.4-1795";
|
||||
|
||||
# Taking a snapshot of the DEB release because there are no tagged version releases.
|
||||
# For new versions, download the upstream release, extract it and check for the version string.
|
||||
# In case there's a new version, create a snapshot of it on https://archive.org before updating it here.
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220921124548/https://download.bluemail.me/BlueMail/deb/BlueMail.deb";
|
||||
sha256 = "sha256-deO+D9HSfj1YEDSO5Io0MA7H8ZK9iFSRwB/e+8GkgOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
dpkg
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pango
|
||||
gtk3
|
||||
alsa-lib
|
||||
nss
|
||||
libXdamage
|
||||
libdrm
|
||||
mesa
|
||||
libxshmfence
|
||||
udev
|
||||
];
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
|
||||
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv opt/BlueMail/* $out
|
||||
ln -s $out/bluemail $out/bin/bluemail
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}"
|
||||
"--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/bluemail \
|
||||
''${makeWrapperArgs[@]} \
|
||||
''${gappsWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free, secure, universal email app, capable of managing an unlimited number of mail accounts";
|
||||
homepage = "https://bluemail.me";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadical";
|
||||
version = "1.5.0";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminbiere";
|
||||
repo = "cadical";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "sha256-Po+pGoUwk1gtBqz4Sc/QQ52rRGbA2pATebX+KPYII5o=";
|
||||
sha256 = "sha256-3H/vowWfE1jfomYg2hOi3B3zjWa4CaLHAJXnoKWzskU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
|
|
@ -13,25 +13,26 @@ assert cudnnSupport -> cudaSupport;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mxnet";
|
||||
version = "1.8.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "apache-mxnet-src-${version}-incubating.tar.gz";
|
||||
url = "https://dlcdn.apache.org/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz";
|
||||
hash = "sha256-la/5hYlaukCcCNVRRRCuOLiEkM+2KBqzpf8PWCbI21Q=";
|
||||
hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build error https://github.com/apache/incubator-mxnet/issues/19405
|
||||
# Remove the following two patches when updating mxnet to 2.0.
|
||||
(fetchpatch {
|
||||
name = "mxnet-fix-gcc-linker-error-1.patch";
|
||||
url = "https://github.com/apache/incubator-mxnet/commit/78e31d66d19e385ca4ef73245ce79a47e375d8d1.diff";
|
||||
sha256 = "sha256-UfmGhh4RbvrEOXe6IJxHm1Aqpy1gS6gHxrX5KQBXjv4=";
|
||||
name = "1-auto-disable-sse-for-non-x86.patch";
|
||||
url = "https://github.com/apache/incubator-mxnet/commit/55e69871d4cadec51a8bbb6700131065388cb0b9.patch";
|
||||
hash = "sha256-uaMpM0F9HRtEBXz2ewB/dlbuKaY5/RineCPUE2T6CHU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "mxnet-fix-gcc-linker-error-2.patch";
|
||||
url = "https://github.com/apache/incubator-mxnet/commit/9bfe3116aabd01049fdbd90855cb245a30b795df.diff";
|
||||
sha256 = "sha256-BL7Zf7Bgn0qpai9HbQ6LBxZNa3iLjVJSe5nxZgqI/fw=";
|
||||
name = "2-auto-disable-sse-for-non-x86.patch";
|
||||
url = "https://github.com/apache/incubator-mxnet/commit/c1b96f562f55dfa024ac941d7b104f00e239ee0f.patch";
|
||||
excludes = ["ci/docker/runtime_functions.sh"];
|
||||
hash = "sha256-r1LbC8ueRooW5tTNakAlRSJ+9aR4WXXoEKx895DgOs4=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
@ -3,10 +3,11 @@
|
|||
, fetchurl
|
||||
, gmp
|
||||
, libX11
|
||||
, libpthreadstubs
|
||||
, perl
|
||||
, readline
|
||||
, tex
|
||||
, withThread ? true, libpthreadstubs
|
||||
, withThread ? true
|
||||
}:
|
||||
|
||||
assert withThread -> libpthreadstubs != null;
|
||||
|
@ -80,7 +81,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members;
|
||||
maintainers = with maintainers; [ ertes ] ++ teams.sage.members;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
mainProgram = "gp";
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gp2c";
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
|
||||
sha256 = "039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf";
|
||||
hash = "sha256-JhN07Kc+vXbBEqlZPcootkgSqnYlYf2lpLLCzXmmnTY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -25,10 +25,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A compiler to translate GP scripts to PARI programs";
|
||||
homepage = "http://pari.math.u-bordeaux.fr/";
|
||||
description = "A compiler to translate GP scripts to PARI programs";
|
||||
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (pari.meta) license maintainers platforms broken;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shod";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phillbush";
|
||||
repo = "shod";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jrPuI3ADppqaJ2y9GksiJZZd4LtN1P5yjWwlf9VuYDc=";
|
||||
sha256 = "sha256-hunHcYWxboCWM+SYH5u09MKP0b7U/9CVfhC6vLVpc3Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -156,11 +156,13 @@ rec {
|
|||
wayland
|
||||
mesa
|
||||
libxkbcommon
|
||||
vulkan-loader
|
||||
|
||||
flac
|
||||
freeglut
|
||||
libjpeg
|
||||
libpng12
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
libmikmod
|
||||
libtheora
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20220908131416";
|
||||
version = "20220921050909";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
sha256 = "sha256-LXtdyLINmUcyT2x9w7KCoLLifcYrSq6JN+2J9wbKjCI=";
|
||||
sha256 = "sha256-ujslsVqUQ16LFdCwwKmY2SnoqNTRenI5cEreupt/6c4=";
|
||||
};
|
||||
vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fennel";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~technomancy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TXmqvhT7Ab+S0UdLgl4xWrVvE//eCbu6qNnoxB7smE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [ lua ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage fennel.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lua Lisp language";
|
||||
homepage = "https://fennel-lang.org/";
|
||||
license = licenses.mit;
|
||||
platforms = lua.meta.platforms;
|
||||
maintainers = [ maintainers.maaslalani ];
|
||||
};
|
||||
}
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
let
|
||||
release = {
|
||||
"8.16.0+0.16.0".sha256 = "sha256-Of5vO6wvqGyxagjGuuY3qCiLKbBr3VzLHiIn9U2R21E=";
|
||||
"8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp";
|
||||
"8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
||||
"8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy";
|
||||
|
@ -17,6 +18,7 @@ in
|
|||
|
||||
defaultVersion = with versions;
|
||||
switch coq.version [
|
||||
{ case = isEq "8.16"; out = "8.16.0+0.16.0"; }
|
||||
{ case = isEq "8.15"; out = "8.15.0+0.15.0"; }
|
||||
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
||||
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
||||
|
@ -78,7 +80,15 @@ in
|
|||
then [
|
||||
./8.12.0+0.12.1.patch
|
||||
]
|
||||
else [
|
||||
else if version == "8.14.0+0.14.0" || version == "8.15.0+0.15.0"
|
||||
then [
|
||||
./janestreet-0.15.patch
|
||||
]
|
||||
else [
|
||||
];
|
||||
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++
|
||||
lib.optional (version == "8.16.0+0.16.0" || version == "dev") coq.ocamlPackages.ppx_hash
|
||||
;
|
||||
|
||||
})
|
||||
|
|
|
@ -23,10 +23,7 @@ in
|
|||
{
|
||||
tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto);
|
||||
|
||||
tensorflow = (setTensorflowSourceRoot "tensorflow" super.tensorflow).override {
|
||||
# the "regular" Python package does not seem to include the binary library
|
||||
libtensorflow = pkgs.libtensorflow-bin;
|
||||
};
|
||||
tensorflow = setTensorflowSourceRoot "tensorflow" super.tensorflow;
|
||||
|
||||
tensorflow-core-ops = setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops;
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "0.9.162";
|
||||
version = "0.10.163";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-eSn3E5opJO+7dVay+j5xEkCIKJvmymozZGVD+vAzO4A=";
|
||||
sha256 = "sha256-54RqqjhKBNSmIIomyhgjujC4CsY33Mkd3QSIc2w9fRg=";
|
||||
};
|
||||
|
||||
executable = "bb";
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, readline, openssl, withThread ? true, withSSL ? true, xxd }:
|
||||
{ lib, stdenv, fetchFromGitHub, readline, openssl, libffi, withThread ? true, withSSL ? true, xxd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trealla";
|
||||
version = "1.20.31";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infradig";
|
||||
owner = "trealla-prolog";
|
||||
repo = "trealla";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A=";
|
||||
sha256 = "sha256-DxlexijQPcNxlPjo/oIvsN//8nZ0injXFHc2t3n4yjg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ xxd ];
|
||||
buildInputs = [ readline openssl ];
|
||||
buildInputs = [ readline openssl libffi ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 -t $out/bin tpl
|
||||
|
@ -34,13 +35,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
# Disable test 81 due to floating point error
|
||||
rm tests/issues/test081.expected tests/issues/test081.pl
|
||||
# Disable tests due to floating point error
|
||||
rm tests/issues-OLD/test081.pl
|
||||
rm tests/issues-OLD/test585.pl
|
||||
# Disable test due to Unicode issues
|
||||
rm tests/issues-OLD/test252.pl
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A compact, efficient Prolog interpreter written in ANSI C";
|
||||
homepage = "https://github.com/infradig/trealla";
|
||||
homepage = "https://github.com/trealla-prolog/trealla";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
mainProgram = "tpl";
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.17.1";
|
||||
version = "5.17.2";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-YX7CUQLMYiUubZsGzElnZq8RbJdSUlW8jEs+de6eAMg=";
|
||||
sha256 = "sha256-QhY4ckDvOOkS+IFixS4mEo8PctFZEIUtEusKeEWBkZU=";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libblockdev";
|
||||
version = "2.26";
|
||||
version = "2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storaged-project";
|
||||
repo = "libblockdev";
|
||||
rev = "${version}-1";
|
||||
sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI=";
|
||||
sha256 = "sha256-6MrM3psLqMcpf4haaEHg3FwrhUDz5h/DeY1w96T0UlE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A library for manipulating block devices";
|
||||
homepage = "http://storaged.org/libblockdev/";
|
||||
changelog = "https://github.com/storaged-project/libblockdev/raw/${src.rev}/NEWS.rst";
|
||||
license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils
|
||||
maintainers = with maintainers; [ johnazoidberg ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libbytesize";
|
||||
inherit version;
|
||||
|
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "storaged-project";
|
||||
repo = "libbytesize";
|
||||
rev = version;
|
||||
sha256 = "sha256-akZFd7rUjBQ/yj79NHWTNUro3wKu81F0Y1GX8gMdJ5Y=";
|
||||
sha256 = "sha256-oSXa3cxJ+Eaeeusz6QeQrzQBs4eombNGJS+lJQMc2b4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdmtx";
|
||||
version = "0.7.5";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmtx";
|
||||
repo = "libdmtx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj";
|
||||
sha256 = "sha256-UQy8iFfl8BNT5cBUMVF1tIScFPfHekSofaebtel9JWk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ libtool ];
|
||||
|
||||
makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" ];
|
||||
makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" "config=release" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple implementation of msgpack in C";
|
||||
|
|
90
pkgs/development/libraries/librasterlite2/default.nix
Normal file
90
pkgs/development/libraries/librasterlite2/default.nix
Normal file
|
@ -0,0 +1,90 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, validatePkgConfig
|
||||
, cairo
|
||||
, curl
|
||||
, fontconfig
|
||||
, freetype
|
||||
, freexl
|
||||
, geos
|
||||
, giflib
|
||||
, libgeotiff
|
||||
, libjpeg
|
||||
, libpng
|
||||
, librttopo
|
||||
, libspatialite
|
||||
, libtiff
|
||||
, libwebp
|
||||
, libxml2
|
||||
, lz4
|
||||
, minizip
|
||||
, openjpeg
|
||||
, pixman
|
||||
, proj
|
||||
, sqlite
|
||||
, zstd
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librasterlite2";
|
||||
version = "1.1.0-beta1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/librasterlite2-${version}.tar.gz";
|
||||
hash = "sha256-9yhM38B600OjFOSHjfAwCHSwFF2dMxsGOwlrSC5+RPQ=";
|
||||
};
|
||||
|
||||
# Fix error: unknown type name 'time_t'
|
||||
postPatch = ''
|
||||
sed -i '49i #include <time.h>' headers/rasterlite2_private.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
validatePkgConfig
|
||||
geos # for geos-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
curl
|
||||
fontconfig
|
||||
freetype
|
||||
freexl
|
||||
giflib
|
||||
geos
|
||||
libgeotiff
|
||||
libjpeg
|
||||
libpng
|
||||
librttopo
|
||||
libspatialite
|
||||
libtiff
|
||||
libwebp
|
||||
libxml2
|
||||
lz4
|
||||
minizip
|
||||
openjpeg
|
||||
pixman
|
||||
proj
|
||||
sqlite
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isDarwin ApplicationServices;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Failed tests:
|
||||
# - check_sql_stmt
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Advanced library supporting raster handling methods";
|
||||
homepage = "https://www.gaia-gis.it/fossil/librasterlite2";
|
||||
# They allow any of these
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
68
pkgs/development/libraries/quarto/default.nix
Normal file
68
pkgs/development/libraries/quarto/default.nix
Normal file
|
@ -0,0 +1,68 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, pandoc
|
||||
, esbuild
|
||||
, deno
|
||||
, fetchurl
|
||||
, nodePackages
|
||||
, rWrapper
|
||||
, rPackages
|
||||
, makeWrapper
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quarto";
|
||||
version = "1.1.189";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-deno-path.patch
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/quarto \
|
||||
--prefix PATH : ${lib.makeBinPath [ deno ]} \
|
||||
--prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \
|
||||
--prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \
|
||||
--prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \
|
||||
--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown]; }}/bin/R \
|
||||
--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ])}/bin/python3
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share
|
||||
|
||||
rm -r bin/tools
|
||||
|
||||
mv bin/* $out/bin
|
||||
mv share/* $out/share
|
||||
|
||||
runHook preInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source scientific and technical publishing system built on Pandoc";
|
||||
longDescription = ''
|
||||
Quarto is an open-source scientific and technical publishing system built on Pandoc.
|
||||
Quarto documents are authored using markdown, an easy to write plain text format.
|
||||
'';
|
||||
homepage = "https://quarto.org/";
|
||||
changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ mrtarantoga ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
|
||||
};
|
||||
}
|
8
pkgs/development/libraries/quarto/fix-deno-path.patch
Normal file
8
pkgs/development/libraries/quarto/fix-deno-path.patch
Normal file
|
@ -0,0 +1,8 @@
|
|||
--- a/bin/quarto
|
||||
+++ b/bin/quarto
|
||||
@@ -125,4 +125,4 @@ fi
|
||||
# Be sure to include any already defined QUARTO_DENO_OPTIONS
|
||||
QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
|
||||
|
||||
-"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@"
|
||||
+deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@"
|
|
@ -1,75 +0,0 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, addOpenGLRunpath
|
||||
, cudaSupport ? false, cudaPackages ? {}
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
broken = !stdenv.isLinux && !stdenv.isDarwin;
|
||||
|
||||
inherit (cudaPackages) cudatoolkit cudnn;
|
||||
|
||||
tfType = if cudaSupport then "gpu" else "cpu";
|
||||
|
||||
system =
|
||||
if stdenv.isLinux then "linux"
|
||||
else "darwin";
|
||||
|
||||
platform = "x86_64";
|
||||
|
||||
rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
|
||||
++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]);
|
||||
|
||||
packages = import ./binary-hashes.nix;
|
||||
|
||||
patchLibs =
|
||||
if stdenv.isDarwin
|
||||
then ''
|
||||
install_name_tool -id $out/lib/libtensorflow.dylib $out/lib/libtensorflow.dylib
|
||||
install_name_tool -id $out/lib/libtensorflow_framework.dylib $out/lib/libtensorflow_framework.dylib
|
||||
''
|
||||
else ''
|
||||
patchelf --set-rpath "${rpath}:$out/lib" $out/lib/libtensorflow.so
|
||||
patchelf --set-rpath "${rpath}" $out/lib/libtensorflow_framework.so
|
||||
${optionalString cudaSupport ''
|
||||
addOpenGLRunpath $out/lib/libtensorflow.so $out/lib/libtensorflow_framework.so
|
||||
''}
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libtensorflow";
|
||||
inherit (packages) version;
|
||||
|
||||
src = fetchurl packages."${tfType}-${system}-${platform}";
|
||||
|
||||
nativeBuildInputs = optional cudaSupport addOpenGLRunpath;
|
||||
|
||||
# Patch library to use our libc, libstdc++ and others
|
||||
buildCommand = ''
|
||||
mkdir -pv $out
|
||||
tar -C $out -xzf $src
|
||||
chmod -R +w $out
|
||||
${patchLibs}
|
||||
|
||||
# Write pkg-config file.
|
||||
mkdir $out/lib/pkgconfig
|
||||
cat > $out/lib/pkgconfig/tensorflow.pc << EOF
|
||||
Name: TensorFlow
|
||||
Version: ${version}
|
||||
Description: Library for computation using data flow graphs for scalable machine learning
|
||||
Requires:
|
||||
Libs: -L$out/lib -ltensorflow
|
||||
Cflags: -I$out/include/tensorflow
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "C API for TensorFlow";
|
||||
homepage = "https://www.tensorflow.org/install/lang_c";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
version = "2.4.0";
|
||||
"cpu-linux-x86_64" = {
|
||||
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-2.4.0.tar.gz";
|
||||
sha256 = "022p5jjwmb8rhyyis3cpk2lw45apl2vz49m2rgxmd75h783x1gjk";
|
||||
};
|
||||
"gpu-linux-x86_64" = {
|
||||
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-2.4.0.tar.gz";
|
||||
sha256 = "1fclvbrn3fs8qmhmh3lzni7s7wl1w30a071b4gzh9ifnxdhip6lq";
|
||||
};
|
||||
"cpu-darwin-x86_64" = {
|
||||
url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-2.4.0.tar.gz";
|
||||
sha256 = "09x096nslg04c8sr7bd5v68a5gfinc0f1h36lbzn8bahs8b1agi3";
|
||||
};
|
||||
}
|
|
@ -1,26 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# ./prefetcher.sh 2.4.0 binary-hashes.nix
|
||||
|
||||
version="$1"
|
||||
hashfile="$2"
|
||||
rm -f $hashfile
|
||||
echo "{" >> $hashfile
|
||||
echo "version = \"$version\";" >> $hashfile
|
||||
for sys in "linux" "darwin"; do
|
||||
for tfpref in "cpu" "gpu"; do
|
||||
for platform in "x86_64"; do
|
||||
if [ $sys = "darwin" ] && [ $tfpref = "gpu" ]; then
|
||||
continue
|
||||
fi
|
||||
url=https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-$tfpref-$sys-$platform-$version.tar.gz
|
||||
hash=$(nix-prefetch-url $url)
|
||||
echo "\"${tfpref}-${sys}-${platform}\" = {" >> $hashfile
|
||||
echo " url = \"$url\";" >> $hashfile
|
||||
echo " sha256 = \"$hash\";" >> $hashfile
|
||||
echo "};" >> $hashfile
|
||||
done
|
||||
done
|
||||
done
|
||||
echo "}" >> $hashfile
|
||||
|
26
pkgs/development/libraries/virtualpg/default.nix
Normal file
26
pkgs/development/libraries/virtualpg/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchurl, validatePkgConfig, postgresql, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virtualpg";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/virtualpg-${version}.tar.gz";
|
||||
hash = "sha256-virr64yf8nQ4IIX1HUIugjhYvKT2vC+pCYFkZMah4Is=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
validatePkgConfig
|
||||
postgresql # for pg_config
|
||||
];
|
||||
|
||||
buildInputs = [ postgresql sqlite ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Loadable dynamic extension to both SQLite and SpatiaLite";
|
||||
homepage = "https://www.gaia-gis.it/fossil/virtualpg";
|
||||
license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
|
@ -453,6 +453,32 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
fennel = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchurl, lua
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fennel";
|
||||
version = "1.2.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/fennel-1.2.0-1.rockspec";
|
||||
sha256 = "14qr0gldqgvzx3yzfjvy48inqn46xf0d92pcxp3hr1a17sf7xqmf";
|
||||
}).outPath;
|
||||
src = fetchurl {
|
||||
url = "https://fennel-lang.org/downloads/fennel-1.2.0.tar.gz";
|
||||
sha256 = "0ymnsri27pj98jbwx7hxsn1w39rxns0i8ds1fl421spc13gx88gx";
|
||||
};
|
||||
|
||||
disabled = with lua; (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://fennel-lang.org/";
|
||||
description = "A lisp that compiles to Lua";
|
||||
maintainers = with lib.maintainers; [ misterio77 ];
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
fifo = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchzip, lua
|
||||
}:
|
||||
|
|
|
@ -29,6 +29,15 @@ with prev;
|
|||
'';
|
||||
});
|
||||
|
||||
fennel = prev.fennel.overrideAttrs(oa: {
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [
|
||||
pkgs.installShellFiles
|
||||
];
|
||||
postInstall = ''
|
||||
installManPage fennel.1
|
||||
'';
|
||||
});
|
||||
|
||||
cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
|
||||
externalDeps = [
|
||||
{ name = "CRYPTO"; dep = pkgs.openssl_1_1; }
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocurrencylayer";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-ecosystem";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-t2Pcoakk25vtUYajIZVITsrEUSdwwiA3fbdswy3n9P8=";
|
||||
sha256 = "sha256-neWUld/XnF5xTHSrw5EfGfNhpYzZi5TZsWN4+eqsVXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-r5bBomAoRwlII8pT/2o+0va/oBr3s8b8v2jq9n6WDwI=";
|
||||
hash = "sha256-+mp6MycCDInFOZTVwpOhJiLkl/qKYjPhoch6LwO5aL4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopg";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WzyBgUxqxLvyNNMoRO2FuLxAyNvhBrA7U5eZqHxaL4Q=";
|
||||
sha256 = "sha256-ZHfwuDtQm7SlLX3sAoYONgCIWnafOj/L8bXjAdwYDKI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "34";
|
||||
version = "35";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NxxM1rU781QTfNWfE6maNovPZNDwU54ST1lxhTKmmBA=";
|
||||
hash = "sha256-mKAg6LNtHEmF223xIrZM7rSxE2+B4jUPCv0dCtHmHXc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.34";
|
||||
version = "0.2.35";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GVJw0ugvzP7gGOhaV03JxWGUlStnedbRVV1+S7BDU/w=";
|
||||
sha256 = "sha256-MzVv0HN87eDsz0mP/rqH6FZVRgq95iTuu8mikkofT30=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,21 +9,26 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "canonicaljson";
|
||||
version = "1.6.2";
|
||||
format = "setuptools";
|
||||
version = "1.6.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rwC+jOnFiYV98Xa7lFlPDUOw4CfwJ6jXz4l4/bgZAko=";
|
||||
hash = "sha256-yll2C8J0qJmg2nWAnWkJrkPlEjOB/W7wQKRNGVLAtEg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
frozendict
|
||||
simplejson
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
frozendict = [
|
||||
frozendict
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbus-fast";
|
||||
version = "1.4.0";
|
||||
version = "1.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vbsigiUSGeetY+1MEeQ/cO3Oj8Ah0Yg9BUPo2Gc06KU=";
|
||||
hash = "sha256-SADUeLD4quPxKChf1A4ph1iI8zu7oCDg4nJNFl77f+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -32,7 +32,8 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=dbus_fast --cov-report=term-missing:skip-covered" ""
|
||||
--replace " --cov=dbus_fast --cov-report=term-missing:skip-covered" "" \
|
||||
--replace "[tool.poetry.group.dev.dependencies]" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -2,15 +2,19 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.5";
|
||||
pname = "dj-email-url";
|
||||
version = "1.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk=";
|
||||
hash = "sha256-Vf/jMp5I9U+Kdao27OCPNl4J1h+KIJdz7wmh1HYOaZo=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
@ -21,9 +25,9 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/migonzalvar/dj-email-url";
|
||||
description = "Use an URL to configure email backend settings in your Django Application";
|
||||
homepage = "https://github.com/migonzalvar/dj-email-url";
|
||||
license = licenses.bsd0;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
, databases
|
||||
, flask
|
||||
, httpx
|
||||
, hatchling
|
||||
, orjson
|
||||
, passlib
|
||||
, peewee
|
||||
, python-jose
|
||||
|
@ -19,18 +21,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi";
|
||||
version = "0.79.1";
|
||||
format = "flit";
|
||||
version = "0.85.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tiangolo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vriEwUcdITKLeIy1++dvsl5Guhtjlk2WZQrprVQsYMc=";
|
||||
hash = "sha256-mgrw5MQMqFcXExtsu/jW01dMlygfE1GzSqXHI6BG7j4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "starlette==" "starlette>="
|
||||
|
@ -46,6 +52,7 @@ buildPythonPackage rec {
|
|||
databases
|
||||
flask
|
||||
httpx
|
||||
orjson
|
||||
passlib
|
||||
peewee
|
||||
python-jose
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fjaraskupan";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -17,8 +17,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "elupus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ohadGQxtW8YcSDIF7xZhy84xu0Vi5yj/QEVi8WRRBSI=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i7816KJraHkrXKYA+vhKMs5xhXksnYc2uYiE0pPEicw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gaphas";
|
||||
version = "3.6.0";
|
||||
version = "3.7.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yleYbAJdDVzZrMQ3izi9UX3Ji1vIuQDc+RK5+wzrMi4=";
|
||||
sha256 = "sha256-iT8Gez8PgIrdAS9Kd83aY1yOQFL45KB+SES/50wTFEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.17.3";
|
||||
version = "0.19.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0tUTqSxpOYhdrXbe0/Rqr9HkQ8kJKJFK6GHLX6740hc=";
|
||||
hash = "sha256-KMWz/CiF0Xti8G31T6JAJfUJEUpBa5QczjrQeA2KcrA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-stream";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zsjKOqkXy3Je7z8U4M016a4t2cWdUqL2tf27Dc8a/gw=";
|
||||
hash = "sha256-6VWAaTjzVDss01aFI53Lg0oNuus5u4TRF/co9DHOhLU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -30,6 +30,10 @@ buildPythonPackage rec {
|
|||
"json_stream"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_writer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Streaming JSON parser";
|
||||
homepage = "https://github.com/daggaz/json-stream";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "luftdaten";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-luftdaten";
|
||||
rev = version;
|
||||
sha256 = "sha256-tYaY/F4mdO5k+Oj+RkNFWP8xqh1xuDyoAKBFzAhamkA=";
|
||||
sha256 = "sha256-+wIouOHIYgjIrObos21vzdKFQLhwutorarVUBDxCsaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
36
pkgs/development/python-modules/msgspec/default.nix
Normal file
36
pkgs/development/python-modules/msgspec/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, msgpack
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgspec";
|
||||
version = "0.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcrist";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8guKmEnDAOVzBuSvqy5V+dWY1f8FPbysMZTe9FVJPxQ=";
|
||||
};
|
||||
|
||||
# Requires libasan to be accessible
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"msgspec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to handle JSON/MessagePack";
|
||||
homepage = "https://github.com/jcrist/msgspec";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "netdata";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-netdata";
|
||||
rev = version;
|
||||
sha256 = "sha256-D0W+zOpD2+iynhHMZh4obUSJJKmP3DnzA7blNWi6eHk=";
|
||||
sha256 = "sha256-vrXXvCoZ1jErlxTcjGbtA8Uio7UDxnt3aNb9FQ0PkrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipma";
|
||||
version = "3.0.2";
|
||||
version = "3.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "dgomes";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AF4bwEsAwJ5MoBQieNDFQ00LILJu+bZZttw4T5+6gkk=";
|
||||
hash = "sha256-KyXHNkP/XJlTdVFdP91x3udMquQju8G2VUHLPvZymtk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, aiohttp
|
||||
, aioshutil
|
||||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, ipython
|
||||
, orjson
|
||||
|
@ -27,7 +28,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.2.0";
|
||||
version = "4.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -36,13 +37,12 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DBOPHeSEdM6cev2BZs1AwXmzNPVsekNklu9c+KhECiI=";
|
||||
hash = "sha256-77vBKca4S0XEa5O4ntuBW8uEwVig7IBH6BX3QEmvHWc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov=pyunifiprotect --cov-append" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=pyunifiprotect --cov-append" "" \
|
||||
--replace "pydantic!=1.9.1" "pydantic"
|
||||
'';
|
||||
|
||||
|
@ -50,6 +50,7 @@ buildPythonPackage rec {
|
|||
aiofiles
|
||||
aiohttp
|
||||
aioshutil
|
||||
dateparser
|
||||
orjson
|
||||
packaging
|
||||
pillow
|
||||
|
@ -57,7 +58,7 @@ buildPythonPackage rec {
|
|||
pyjwt
|
||||
pytz
|
||||
typer
|
||||
];
|
||||
] ++ typer.optional-dependencies.all;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
shell = [
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcs-api-client";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "rigetti";
|
||||
repo = "qcs-api-client-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-F3Fc03JWS73LcDCufWl/gLkjGvzlwLdBFVsSxtn3LvE=";
|
||||
hash = "sha256-Fhu2XtreilkxwUZPmr79jFsNoajpLs0AzTMc7BaiduA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, importlib-metadata
|
||||
|
@ -9,7 +8,6 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rstcheck-core
|
||||
, shellingham
|
||||
, typer
|
||||
, types-docutils
|
||||
, typing-extensions
|
||||
|
@ -17,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rstcheck";
|
||||
version = "6.0.0.post1";
|
||||
version = "6.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -26,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "rstcheck";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw=";
|
||||
hash = "sha256-dw/KggiZpKaFZMcTIaSBUhR4oQsZI3iSmEj9Sy80wTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,10 +32,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
docutils
|
||||
rstcheck-core
|
||||
shellingham
|
||||
types-docutils
|
||||
typing-extensions
|
||||
pydantic
|
||||
|
@ -45,7 +41,7 @@ buildPythonPackage rec {
|
|||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
importlib-metadata
|
||||
];
|
||||
] ++ typer.optional-dependencies.all;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
@ -53,6 +49,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' \
|
||||
--replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
|
||||
'';
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensor-state-data";
|
||||
version = "2.6.0";
|
||||
version = "2.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qu8dP0HAu6szL/GwfX6ar3P0No5HDBbULNWdjLaiLwc=";
|
||||
hash = "sha256-oSz1MAvHf5yk7niIvlwHOJTMmemQaZeBZpBVvwJcmug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.1.23";
|
||||
version = "1.1.25";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nRGuDcllBAJTGjA0CIPOX/WCO04dYCm+AFC/aYKiBdY=";
|
||||
hash = "sha256-Zky1PShQE/V2pSJURYTQHnsqdfsD3k7DWMnDidmwfxs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -1,13 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, openssl, rsa, pyaes, pythonOlder }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, rsa
|
||||
, pyaes
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "telethon";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Telethon";
|
||||
sha256 = "sha256-Z22XuSbm0w2+0x1sbmYRzeyfyCdZeFzqVcR3C3RhQpA=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LonamiWebs";
|
||||
repo = "Telethon";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xmFoCUqYo600RH72KWG/aM7hKGiTYdCBsbPOFipxIzA=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -15,15 +28,23 @@ buildPythonPackage rec {
|
|||
"ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
rsa
|
||||
pyaes
|
||||
];
|
||||
|
||||
# No tests available
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
pytestFlagsArray = [
|
||||
"tests/telethon"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/LonamiWebs/Telethon";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, flit-core
|
||||
|
@ -23,7 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM=";
|
||||
hash = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,14 +35,20 @@ buildPythonPackage rec {
|
|||
click
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
colorama
|
||||
shellingham
|
||||
rich
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
pytest-sugar
|
||||
shellingham
|
||||
rich
|
||||
coverage # execs coverage in tests
|
||||
];
|
||||
pytest-sugar
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
] ++ passthru.optional-dependencies.all;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
|
@ -54,10 +61,12 @@ buildPythonPackage rec {
|
|||
"test_install_completion"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typer" ];
|
||||
pythonImportsCheck = [
|
||||
"typer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for building CLI applications";
|
||||
description = "Library for building CLI applications";
|
||||
homepage = "https://typer.tiangolo.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ winpat ];
|
||||
|
|
38
pkgs/development/python-modules/vector/default.nix
Normal file
38
pkgs/development/python-modules/vector/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vector";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b785678f449de32476f427911248391ddcc7c3582a522a88cbbd50c92dcae490";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "vector" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way";
|
||||
homepage = "https://github.com/scikit-hep/vector";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xsdata";
|
||||
version = "22.8";
|
||||
version = "22.9";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MWHMRPY35Fs4n9O0z3QRW4IylfSltH3XUNdrCBK2iW4=";
|
||||
hash = "sha256-xi1QArTeWbrKTE6p7f3Aj7d1lxPsIROaruv/IMw+fPw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
138
pkgs/development/tools/build-managers/muon/default.nix
Normal file
138
pkgs/development/tools/build-managers/muon/default.nix
Normal file
|
@ -0,0 +1,138 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, fetchurl
|
||||
, curl
|
||||
, libarchive
|
||||
, libpkgconf
|
||||
, pkgconf
|
||||
, python3
|
||||
, samurai
|
||||
, scdoc
|
||||
, zlib
|
||||
, embedSamurai ? false
|
||||
, buildDocs ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "muon"
|
||||
+ lib.optionalString embedSamurai "-embedded-samurai";
|
||||
version = "unstable-2022-09-24";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
name = "muon-src";
|
||||
owner = "~lattis";
|
||||
repo = "muon";
|
||||
rev = "f385c82a6104ea3341ca34756e2812d700bc43d8";
|
||||
hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconf
|
||||
samurai
|
||||
]
|
||||
++ lib.optionals buildDocs [
|
||||
(python3.withPackages (ps: [ ps.pyyaml ]))
|
||||
scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libarchive
|
||||
libpkgconf
|
||||
samurai
|
||||
zlib
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postUnpack = let
|
||||
# URLs manually extracted from subprojects directory
|
||||
meson-docs-wrap = fetchurl {
|
||||
name = "meson-docs-wrap";
|
||||
url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz";
|
||||
hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg=";
|
||||
};
|
||||
|
||||
samurai-wrap = fetchurl {
|
||||
name = "samurai-wrap";
|
||||
url = "https://mochiro.moe/wrap/samurai-1.2-28-g4e3a595.tar.gz";
|
||||
hash = "sha256-TZAEwndVgoWr/zhykfr0wcz9wM96yG44GfzM5p9TpBo=";
|
||||
};
|
||||
in ''
|
||||
pushd $sourceRoot/subprojects
|
||||
${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"}
|
||||
${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"}
|
||||
popd
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs bootstrap.sh
|
||||
''
|
||||
+ lib.optionalString buildDocs ''
|
||||
patchShebangs subprojects/meson-docs/docs/genrefman.py
|
||||
'';
|
||||
|
||||
# tests try to access "~"
|
||||
postConfigure = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
buildPhase = let
|
||||
featureFlag = feature: flag:
|
||||
"-D${feature}=${if flag then "enabled" else "disabled"}";
|
||||
conditionFlag = condition: flag:
|
||||
"-D${condition}=${lib.boolToString flag}";
|
||||
cmdlineForMuon = lib.concatStringsSep " " [
|
||||
(conditionFlag "static" stdenv.targetPlatform.isStatic)
|
||||
(featureFlag "docs" buildDocs)
|
||||
(featureFlag "samurai" embedSamurai)
|
||||
];
|
||||
cmdlineForSamu = "-j$NIX_BUILD_CORES";
|
||||
in ''
|
||||
runHook preBuild
|
||||
|
||||
./bootstrap.sh stage-1
|
||||
|
||||
./stage-1/muon setup ${cmdlineForMuon} stage-2
|
||||
samu ${cmdlineForSamu} -C stage-2
|
||||
|
||||
stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3
|
||||
samu ${cmdlineForSamu} -C stage-3
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# tests are failing because they don't find Python
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
./stage-3/muon -C stage-3 test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
stage-3/muon -C stage-3 install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://muon.build/";
|
||||
description = "An implementation of Meson build system in C99";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # typical `ar failure`
|
||||
};
|
||||
})
|
||||
# TODO LIST:
|
||||
# 1. setup hook
|
||||
# 2. multiple outputs
|
||||
# 3. automate sources acquisition (especially wraps)
|
||||
# 4. tests
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.6.22";
|
||||
version = "0.6.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W6BBLxKvZ8+KQjkJXv1LsxtCRdgmU1Hj6lBW8TACyN8=";
|
||||
sha256 = "sha256-RbLAnk2O7wqY0OQLprWuRDUWMicqcLOPia+7aRuXbsk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZxuYNtekWlfpo9O1DEXebuixWbWuHMhnOH3G41KC1bU=";
|
||||
vendorSha256 = "sha256-MDyQ9Wn5A5F5CQCfEXzkXZi/Fg6sT/Ikv+Y7fvLY8LA=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromSourcehut, fennel, lua }:
|
||||
{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fnlfmt";
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fennel ];
|
||||
nativeBuildInputs = [ luaPackages.fennel ];
|
||||
|
||||
buildInputs = [ lua ];
|
||||
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
runHook preBuild
|
||||
|
||||
echo "#!${lua}/bin/lua" > fnlfmt
|
||||
${fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
|
||||
${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
|
||||
chmod +x fnlfmt
|
||||
|
||||
runHook postBuild
|
||||
|
|
25
pkgs/development/tools/gdlv/default.nix
Normal file
25
pkgs/development/tools/gdlv/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, OpenGL }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gdlv";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aarzilli";
|
||||
repo = "gdlv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G1/Wbz836yfGZ/1ArICrNbWU6eh4SHXDmo4FKkjUszY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = ".";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ OpenGL ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI frontend for Delve";
|
||||
homepage = "https://github.com/aarzilli/gdlv";
|
||||
maintainers = with maintainers; [ mmlb ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
24
pkgs/development/tools/jaq/default.nix
Normal file
24
pkgs/development/tools/jaq/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jaq";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "01mf02";
|
||||
repo = "jaq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4WCVXrw/v3cGsl7S1nGqKmWrIHeM/ODCXQBxQJgZLjw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-D+Wpzgj05PJcMlGS9eL43SdncHO/q1Wt00gvPlC7ZAE=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A jq clone focused on correctness, speed and simplicity";
|
||||
homepage = "https://github.com/01mf02/jaq";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
};
|
||||
}
|
40
pkgs/development/tools/kubeswitch/default.nix
Normal file
40
pkgs/development/tools/kubeswitch/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, testers, kubeswitch }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeswitch";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielfoehrKn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-p4/nYZt+OwNsFX9f9ySfQaz6gbz+8Mvt00W2Rs4dpCY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [ "cmd/main.go" ];
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.version=${version}"
|
||||
"-X github.com/danielfoehrkn/kubeswitch/cmd/switcher.buildDate=1970-01-01"
|
||||
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = kubeswitch;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/main $out/bin/switch
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The kubectx for operators";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/danielfoehrKn/kubeswitch";
|
||||
maintainers = with maintainers; [ bryanasdev000 ];
|
||||
mainProgram = "switch";
|
||||
};
|
||||
}
|
|
@ -14,16 +14,16 @@ let
|
|||
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "4.2.2";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-vGKDngFYh24wwR5nAYEz1GXm+K4sqEBvOp9jsioE0wU=";
|
||||
sha256 = "sha256-PhzxWLkqsHU32vIZwHzdy86bwIzDDmnxp12PS774P3k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-s2gQuLkPxKQceGl3II9D6vWisYgL+YCI/YhX+mSyPoo=";
|
||||
cargoSha256 = "sha256-tH566L0oHnI9mNp1KtJYaBaWCkiAOrtBYkfVSCA2N6w=";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
|
||||
|
||||
|
@ -48,7 +48,7 @@ in rustPlatform.buildRustPackage rec {
|
|||
# generate the man page
|
||||
+ lib.optionalString (!isCross) ''
|
||||
# TexLab builds man page separately in CI:
|
||||
# https://github.com/latex-lsp/texlab/blob/v4.2.2/.github/workflows/publish.yml#L131-L135
|
||||
# https://github.com/latex-lsp/texlab/blob/v4.3.0/.github/workflows/publish.yml#L131-L135
|
||||
help2man --no-info "$out/bin/texlab" > texlab.1
|
||||
installManPage texlab.1
|
||||
'';
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "railway";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A8bfs8GgpsuX3QlJsjUWhgh0zXX0+HULRBQSY+lkXuE=";
|
||||
sha256 = "sha256-g1ljbdRppu4IGEgYxHeaRtG8SvgQ+/+Tir1L1dfuZw4=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
|
32
pkgs/development/tools/rust/humility/default.nix
Normal file
32
pkgs/development/tools/rust/humility/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, libusb
|
||||
, libftdi
|
||||
, cargo-readme
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "humility";
|
||||
version = "unstable-2022-09-15";
|
||||
|
||||
nativeBuildInputs = [ pkg-config cargo-readme ];
|
||||
buildInputs = [ libusb libftdi ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxidecomputer";
|
||||
repo = pname;
|
||||
rev = "d336c21c7b6da7f8203a9331c7657581de2bc6ad";
|
||||
sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-UhO8VO3OCfYc8Xq/P+l9f5ZrhOD/TBzSClAeAXLJLlc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Debugger for Hubris";
|
||||
homepage = "https://github.com/oxidecomputer/humility";
|
||||
license = with licenses; [ mpl20 ];
|
||||
maintainers = with maintainers; [ therishidesai ];
|
||||
};
|
||||
}
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.2.6";
|
||||
version = "4.2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "sha256-AJqD8xF+FIKw34NhcnYCexXRs8aIzL8XDHhs5fGBTn0=";
|
||||
sha256 = "sha256-bA1rz4PvpcdMSGob+KIdSpyq6ePlLj8l61r0+XclfZY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
26
pkgs/os-specific/darwin/defaultbrowser/default.nix
Normal file
26
pkgs/os-specific/darwin/defaultbrowser/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, fetchFromGitHub, Foundation }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "defaultbrowser";
|
||||
version = "unstable-2020-07-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kerma";
|
||||
repo = pname;
|
||||
rev = "d2860c00dd7fbb5d615232cc819d7d492a6a6ddb";
|
||||
sha256 = "sha256-SelUQXoKtShcDjq8uKg3wM0kG2opREa2DGQCDd6IsOQ=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=cc" "PREFIX=$(out)" ];
|
||||
|
||||
buildInputs = [ Foundation ];
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "defaultbrowser";
|
||||
description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X";
|
||||
homepage = "https://github.com/kerma/defaultbrowser";
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ Enzime ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "5.19.10"; #zen
|
||||
version = "5.19.11"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1agwg917w1452d84ysc4v37knc1ljp2108nhrbp88qkiy2s7f4mb"; #zen
|
||||
sha256 = "0slrbsqdvnlnk2hr356wjmbhh8qkn39k34jn1lidhjyfb9c7fg6a"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "5.19.10"; #lqx
|
||||
version = "5.19.11"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0szrh7xj0xh696cvx95ng1bwddzs1bggk6cwhqbjdnk0pjk85xg7"; #lqx
|
||||
sha256 = "0mv3ic1zx1xil87zllbqkm587lpzzj3vrw376ch4imzyvmz6b2yx"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
@ -81,5 +81,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.vcunat ];
|
||||
mainProgram = "knotd";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -98,6 +98,7 @@ unwrapped = stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.vcunat /* upstream developer */ ];
|
||||
mainProgram = "kresd";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -112,6 +113,7 @@ wrapped-full = runCommand unwrapped.name
|
|||
];
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
inherit (unwrapped) meta;
|
||||
}
|
||||
''
|
||||
mkdir -p "$out"/bin
|
||||
|
|
|
@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildPhase = ''
|
||||
export HOME=$PWD
|
||||
# This option is needed for openssl-3 compatibility
|
||||
# Otherwise we encounter this upstream issue: https://github.com/mastodon/mastodon/issues/17924
|
||||
export NODE_OPTIONS=--openssl-legacy-provider
|
||||
fixup_yarn_lock ~/yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
|
|
|
@ -11,10 +11,11 @@ let
|
|||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.25.0a20";
|
||||
pname = "tulir-telethon";
|
||||
src = oldAttrs.src.override {
|
||||
src = super.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue