Merge remote-tracking branch 'origin/release-21.05' into staging-next-21.05
This commit is contained in:
Jonathan Ringer
commit
7b601ada77
|
|
@ -526,6 +526,16 @@ If you do need to do create this sort of patch file, one way to do so is with gi
|
|||
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
|
||||
```
|
||||
|
||||
If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`:
|
||||
|
||||
- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.
|
||||
- `extraPrefix`: Prefix pathnames by this string.
|
||||
- `excludes`: Exclude files matching this pattern.
|
||||
- `includes`: Include only files matching this pattern.
|
||||
- `revert`: Revert the patch.
|
||||
|
||||
Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well.
|
||||
|
||||
## Package tests {#sec-package-tests}
|
||||
|
||||
Tests are important to ensure quality and make reviews and automatic updates easy.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para>
|
||||
<para>The <package>linux_latest</package> kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). </para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
|
||||
|
|
@ -305,6 +306,24 @@
|
|||
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service is
|
||||
now using by default the new and maintained fork
|
||||
<literal>gerbera</literal> package instead of the unmaintained
|
||||
<literal>mediatomb</literal> package. If you want to keep the old
|
||||
behavior, you must declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.package = pkgs.mediatomb;
|
||||
</programlisting>
|
||||
One new option <literal>openFirewall</literal> has been introduced which
|
||||
defaults to false. If you relied on the service declaration to add the
|
||||
firewall rules itself before, you should now declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.openFirewall = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation.
|
||||
|
|
@ -427,7 +446,7 @@
|
|||
</para>
|
||||
<programlisting>
|
||||
TMPDIR=$(mktemp -d)
|
||||
slaptest -f /path/to/slapd.conf $TMPDIR
|
||||
slaptest -f /path/to/slapd.conf -F $TMPDIR
|
||||
slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))'
|
||||
</programlisting>
|
||||
<para>
|
||||
|
|
@ -835,6 +854,29 @@ environment.systemPackages = [
|
|||
All services should use <xref linkend="opt-systemd.services._name_.startLimitIntervalSec" /> or <literal>StartLimitIntervalSec</literal> in <xref linkend="opt-systemd.services._name_.unitConfig" /> instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service
|
||||
declares new options. It also adapts existing options so the
|
||||
configuration generation is now lazy. The existing option
|
||||
<literal>customCfg</literal> (defaults to false), when enabled, stops
|
||||
the service configuration generation completely. It then expects the
|
||||
users to provide their own correct configuration at the right location
|
||||
(whereas the configuration was generated and not used at all before).
|
||||
The new option <literal>transcodingOption</literal> (defaults to no)
|
||||
allows a generated configuration. It makes the mediatomb service pulls
|
||||
the necessary runtime dependencies in the nix store (whereas it was
|
||||
generated with hardcoded values before). The new option
|
||||
<literal>mediaDirectories</literal> allows the users to declare autoscan
|
||||
media directories from their nixos configuration:
|
||||
<programlisting>
|
||||
services.mediatomb.mediaDirectories = [
|
||||
{ path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }
|
||||
{ path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }
|
||||
];
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Unbound DNS resolver service (<literal>services.unbound</literal>) has been refactored to allow reloading, control sockets and to fix startup ordering issues.
|
||||
|
|
|
|||
|
|
@ -472,7 +472,6 @@
|
|||
./services/misc/cgminer.nix
|
||||
./services/misc/confd.nix
|
||||
./services/misc/couchpotato.nix
|
||||
./services/misc/dendrite.nix
|
||||
./services/misc/devmon.nix
|
||||
./services/misc/dictd.nix
|
||||
./services/misc/duckling.nix
|
||||
|
|
|
|||
|
|
@ -1,181 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.dendrite;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
configurationYaml = settingsFormat.generate "dendrite.yaml" cfg.settings;
|
||||
workingDir = "/var/lib/dendrite";
|
||||
in
|
||||
{
|
||||
options.services.dendrite = {
|
||||
enable = lib.mkEnableOption "matrix.org dendrite";
|
||||
httpPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = 8008;
|
||||
description = ''
|
||||
The port to listen for HTTP requests on.
|
||||
'';
|
||||
};
|
||||
httpsPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
default = null;
|
||||
description = ''
|
||||
The port to listen for HTTPS requests on.
|
||||
'';
|
||||
};
|
||||
tlsCert = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/dendrite/server.cert";
|
||||
default = null;
|
||||
description = ''
|
||||
The path to the TLS certificate.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
tlsKey = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/dendrite/server.key";
|
||||
default = null;
|
||||
description = ''
|
||||
The path to the TLS key.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/dendrite/registration_secret";
|
||||
default = null;
|
||||
description = ''
|
||||
Environment file as defined in <citerefentry>
|
||||
<refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum>
|
||||
</citerefentry>.
|
||||
Secrets may be passed to the service without adding them to the world-readable
|
||||
Nix store, by specifying placeholder variables as the option value in Nix and
|
||||
setting these variables accordingly in the environment file. Currently only used
|
||||
for the registration secret to allow secure registration when
|
||||
client_api.registration_disabled is true.
|
||||
|
||||
<programlisting>
|
||||
# snippet of dendrite-related config
|
||||
services.dendrite.settings.client_api.registration_shared_secret = "$REGISTRATION_SHARED_SECRET";
|
||||
</programlisting>
|
||||
|
||||
<programlisting>
|
||||
# content of the environment file
|
||||
REGISTRATION_SHARED_SECRET=verysecretpassword
|
||||
</programlisting>
|
||||
|
||||
Note that this file needs to be available on the host on which
|
||||
<literal>dendrite</literal> is running.
|
||||
'';
|
||||
};
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options.global = {
|
||||
server_name = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "example.com";
|
||||
description = ''
|
||||
The domain name of the server, with optional explicit port.
|
||||
This is used by remote servers to connect to this server.
|
||||
This is also the last part of your UserID.
|
||||
'';
|
||||
};
|
||||
private_key = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
example = "${workingDir}/matrix_key.pem";
|
||||
description = ''
|
||||
The path to the signing private key file, used to sign
|
||||
requests and events.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p dendrite --command "generate-keys --private-key matrix_key.pem"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
trusted_third_party_id_servers = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
example = [ "matrix.org" ];
|
||||
default = [ "matrix.org" "vector.im" ];
|
||||
description = ''
|
||||
Lists of domains that the server will trust as identity
|
||||
servers to verify third party identifiers such as phone
|
||||
numbers and email addresses
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.client_api = {
|
||||
registration_disabled = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to disable user registration to the server
|
||||
without the shared secret.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Configuration for dendrite, see:
|
||||
<link xlink:href="https://github.com/matrix-org/dendrite/blob/master/dendrite-config.yaml"/>
|
||||
for available options with which to populate settings.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [{
|
||||
assertion = cfg.httpsPort != null -> (cfg.tlsCert != null && cfg.tlsKey != null);
|
||||
message = ''
|
||||
If Dendrite is configured to use https, tlsCert and tlsKey must be provided.
|
||||
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
'';
|
||||
}];
|
||||
|
||||
systemd.services.dendrite = {
|
||||
description = "Dendrite Matrix homeserver";
|
||||
after = [
|
||||
"network.target"
|
||||
];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "dendrite";
|
||||
WorkingDirectory = workingDir;
|
||||
RuntimeDirectory = "dendrite";
|
||||
RuntimeDirectoryMode = "0700";
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
ExecStartPre =
|
||||
if (cfg.environmentFile != null) then ''
|
||||
${pkgs.envsubst}/bin/envsubst \
|
||||
-i ${configurationYaml} \
|
||||
-o /run/dendrite/dendrite.yaml
|
||||
'' else ''
|
||||
${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml
|
||||
'';
|
||||
ExecStart = lib.strings.concatStringsSep " " ([
|
||||
"${pkgs.dendrite}/bin/dendrite-monolith-server"
|
||||
"--config /run/dendrite/dendrite.yaml"
|
||||
] ++ lib.optionals (cfg.httpPort != null) [
|
||||
"--http-bind-address :${builtins.toString cfg.httpPort}"
|
||||
] ++ lib.optionals (cfg.httpsPort != null) [
|
||||
"--https-bind-address :${builtins.toString cfg.httpsPort}"
|
||||
"--tls-cert ${cfg.tlsCert}"
|
||||
"--tls-key ${cfg.tlsKey}"
|
||||
]);
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
};
|
||||
meta.maintainers = lib.teams.matrix.members;
|
||||
}
|
||||
|
|
@ -115,6 +115,8 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
environment.etc."knot-resolver/kresd.conf".source = configFile; # not required
|
||||
|
||||
networking.resolvconf.useLocalResolver = mkDefault true;
|
||||
|
||||
users.users.knot-resolver =
|
||||
{ isSystemUser = true;
|
||||
group = "knot-resolver";
|
||||
|
|
|
|||
|
|
@ -219,17 +219,6 @@ let
|
|||
|
||||
};
|
||||
|
||||
generatePathUnit = name: values:
|
||||
assert (values.privateKey == null);
|
||||
assert (values.privateKeyFile != null);
|
||||
nameValuePair "wireguard-${name}"
|
||||
{
|
||||
description = "WireGuard Tunnel - ${name} - Private Key";
|
||||
requiredBy = [ "wireguard-${name}.service" ];
|
||||
before = [ "wireguard-${name}.service" ];
|
||||
pathConfig.PathExists = values.privateKeyFile;
|
||||
};
|
||||
|
||||
generateKeyServiceUnit = name: values:
|
||||
assert values.generatePrivateKeyFile;
|
||||
nameValuePair "wireguard-${name}-key"
|
||||
|
|
@ -448,9 +437,6 @@ in
|
|||
// (mapAttrs' generateKeyServiceUnit
|
||||
(filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces));
|
||||
|
||||
systemd.paths = mapAttrs' generatePathUnit
|
||||
(filterAttrs (name: value: value.privateKeyFile != null) cfg.interfaces);
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,6 @@ in {
|
|||
EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile;
|
||||
ExecStart = "${bitwarden_rs}/bin/bitwarden_rs";
|
||||
LimitNOFILE = "1048576";
|
||||
LimitNPROC = "64";
|
||||
PrivateTmp = "true";
|
||||
PrivateDevices = "true";
|
||||
ProtectHome = "true";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,16 @@ let
|
|||
|
||||
cfg = config.services.discourse;
|
||||
|
||||
# Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5
|
||||
upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13;
|
||||
|
||||
postgresqlPackage = if config.services.postgresql.enable then
|
||||
config.services.postgresql.package
|
||||
else
|
||||
pkgs.postgresql;
|
||||
|
||||
postgresqlVersion = lib.getVersion postgresqlPackage;
|
||||
|
||||
# We only want to create a database if we're actually going to connect to it.
|
||||
databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == null;
|
||||
|
||||
|
|
@ -263,6 +268,17 @@ in
|
|||
Discourse database user.
|
||||
'';
|
||||
};
|
||||
|
||||
ignorePostgresqlVersion = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to allow other versions of PostgreSQL than the
|
||||
recommended one. Only effective when
|
||||
<option>services.discourse.database.createLocally</option>
|
||||
is enabled.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
redis = {
|
||||
|
|
@ -398,6 +414,14 @@ in
|
|||
How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
'';
|
||||
};
|
||||
|
||||
forceTLS = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Force implicit TLS as per RFC 8314 3.3.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
incoming = {
|
||||
|
|
@ -497,6 +521,12 @@ in
|
|||
assertion = cfg.hostname != "";
|
||||
message = "Could not automatically determine hostname, set service.discourse.hostname manually.";
|
||||
}
|
||||
{
|
||||
assertion = cfg.database.ignorePostgresqlVersion || (databaseActuallyCreateLocally -> upstreamPostgresqlVersion == postgresqlVersion);
|
||||
message = "The PostgreSQL version recommended for use with Discourse is ${upstreamPostgresqlVersion}, you're using ${postgresqlVersion}. "
|
||||
+ "Either update your PostgreSQL package to the correct version or set services.discourse.database.ignorePostgresqlVersion. "
|
||||
+ "See https://nixos.org/manual/nixos/stable/index.html#module-postgresql for details on how to upgrade PostgreSQL.";
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -530,6 +560,7 @@ in
|
|||
smtp_authentication = cfg.mail.outgoing.authentication;
|
||||
smtp_enable_start_tls = cfg.mail.outgoing.enableStartTLSAuto;
|
||||
smtp_openssl_verify_mode = cfg.mail.outgoing.opensslVerifyMode;
|
||||
smtp_force_tls = cfg.mail.outgoing.forceTLS;
|
||||
|
||||
load_mini_profiler = true;
|
||||
mini_profiler_snapshots_period = 0;
|
||||
|
|
@ -542,8 +573,8 @@ in
|
|||
|
||||
redis_host = cfg.redis.host;
|
||||
redis_port = 6379;
|
||||
redis_slave_host = null;
|
||||
redis_slave_port = 6379;
|
||||
redis_replica_host = null;
|
||||
redis_replica_port = 6379;
|
||||
redis_db = cfg.redis.dbNumber;
|
||||
redis_password = cfg.redis.passwordFile;
|
||||
redis_skip_client_commands = false;
|
||||
|
|
@ -552,8 +583,8 @@ in
|
|||
message_bus_redis_enabled = false;
|
||||
message_bus_redis_host = "localhost";
|
||||
message_bus_redis_port = 6379;
|
||||
message_bus_redis_slave_host = null;
|
||||
message_bus_redis_slave_port = 6379;
|
||||
message_bus_redis_replica_host = null;
|
||||
message_bus_redis_replica_port = 6379;
|
||||
message_bus_redis_db = 0;
|
||||
message_bus_redis_password = null;
|
||||
message_bus_redis_skip_client_commands = false;
|
||||
|
|
@ -606,6 +637,7 @@ in
|
|||
allowed_theme_repos = null;
|
||||
enable_email_sync_demon = false;
|
||||
max_digests_enqueued_per_30_mins_per_site = 10000;
|
||||
cluster_name = null;
|
||||
};
|
||||
|
||||
services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost");
|
||||
|
|
@ -667,6 +699,7 @@ in
|
|||
environment = cfg.package.runtimeEnv // {
|
||||
UNICORN_TIMEOUT = builtins.toString cfg.unicornTimeout;
|
||||
UNICORN_SIDEKIQS = builtins.toString cfg.sidekiqProcesses;
|
||||
MALLOC_ARENA_MAX = "2";
|
||||
};
|
||||
|
||||
preStart =
|
||||
|
|
|
|||
|
|
@ -61,8 +61,10 @@ let
|
|||
?>
|
||||
'';
|
||||
|
||||
secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ];
|
||||
secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ];
|
||||
secretsScript = hostStateDir: ''
|
||||
# The match in this line is not a typo, see https://github.com/NixOS/nixpkgs/pull/124839
|
||||
grep -q "LOOGGED_IN_KEY" "${hostStateDir}/secret-keys.php" && rm "${hostStateDir}/secret-keys.php"
|
||||
if ! test -e "${hostStateDir}/secret-keys.php"; then
|
||||
umask 0177
|
||||
echo "<?php" >> "${hostStateDir}/secret-keys.php"
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ in {
|
|||
etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e:
|
||||
"allow ${e}") cfg.allowedBridges;
|
||||
systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ];
|
||||
etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes";
|
||||
etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes";
|
||||
};
|
||||
|
||||
boot.kernelModules = [ "tun" ];
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ in
|
|||
caddy = handleTest ./caddy.nix {};
|
||||
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
|
||||
cage = handleTestOn ["x86_64-linux"] ./cage.nix {};
|
||||
cagebreak = handleTest ./cagebreak.nix {};
|
||||
cagebreak = handleTestOn ["x86_64-linux"] ./cagebreak.nix {};
|
||||
calibre-web = handleTest ./calibre-web.nix {};
|
||||
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
|
||||
cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; };
|
||||
|
|
@ -93,7 +93,6 @@ in
|
|||
custom-ca = handleTest ./custom-ca.nix {};
|
||||
croc = handleTest ./croc.nix {};
|
||||
deluge = handleTest ./deluge.nix {};
|
||||
dendrite = handleTest ./dendrite.nix {};
|
||||
dhparams = handleTest ./dhparams.nix {};
|
||||
discourse = handleTest ./discourse.nix {};
|
||||
dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
|
||||
|
|
@ -395,7 +394,7 @@ in
|
|||
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
|
||||
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
|
||||
sudo = handleTest ./sudo.nix {};
|
||||
sway = handleTest ./sway.nix {};
|
||||
sway = handleTestOn ["x86_64-linux"] ./sway.nix {};
|
||||
switchTest = handleTest ./switch-test.nix {};
|
||||
sympa = handleTest ./sympa.nix {};
|
||||
syncthing = handleTest ./syncthing.nix {};
|
||||
|
|
|
|||
|
|
@ -1,99 +0,0 @@
|
|||
import ./make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
homeserverUrl = "http://homeserver:8008";
|
||||
|
||||
private_key = pkgs.runCommand "matrix_key.pem" {
|
||||
buildInputs = [ pkgs.dendrite ];
|
||||
} "generate-keys --private-key $out";
|
||||
in
|
||||
{
|
||||
name = "dendrite";
|
||||
meta = with pkgs.lib; {
|
||||
maintainers = teams.matrix.members;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
homeserver = { pkgs, ... }: {
|
||||
services.dendrite = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global.server_name = "test-dendrite-server.com";
|
||||
global.private_key = private_key;
|
||||
client_api.registration_disabled = false;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 8008 ];
|
||||
};
|
||||
|
||||
client = { pkgs, ... }: {
|
||||
environment.systemPackages = [
|
||||
(
|
||||
pkgs.writers.writePython3Bin "do_test"
|
||||
{ libraries = [ pkgs.python3Packages.matrix-nio ]; } ''
|
||||
import asyncio
|
||||
|
||||
from nio import AsyncClient
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
# Connect to dendrite
|
||||
client = AsyncClient("http://homeserver:8008", "alice")
|
||||
|
||||
# Register as user alice
|
||||
response = await client.register("alice", "my-secret-password")
|
||||
|
||||
# Log in as user alice
|
||||
response = await client.login("my-secret-password")
|
||||
|
||||
# Create a new room
|
||||
response = await client.room_create(federate=False)
|
||||
room_id = response.room_id
|
||||
|
||||
# Join the room
|
||||
response = await client.join(room_id)
|
||||
|
||||
# Send a message to the room
|
||||
response = await client.room_send(
|
||||
room_id=room_id,
|
||||
message_type="m.room.message",
|
||||
content={
|
||||
"msgtype": "m.text",
|
||||
"body": "Hello world!"
|
||||
}
|
||||
)
|
||||
|
||||
# Sync responses
|
||||
response = await client.sync(timeout=30000)
|
||||
|
||||
# Check the message was received by dendrite
|
||||
last_message = response.rooms.join[room_id].timeline.events[-1].body
|
||||
assert last_message == "Hello world!"
|
||||
|
||||
# Leave the room
|
||||
response = await client.room_leave(room_id)
|
||||
|
||||
# Close the client
|
||||
await client.close()
|
||||
|
||||
asyncio.get_event_loop().run_until_complete(main())
|
||||
''
|
||||
)
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
with subtest("start the homeserver"):
|
||||
homeserver.wait_for_unit("dendrite.service")
|
||||
homeserver.wait_for_open_port(8008)
|
||||
|
||||
with subtest("ensure messages can be exchanged"):
|
||||
client.succeed("do_test")
|
||||
'';
|
||||
|
||||
}
|
||||
)
|
||||
|
|
@ -51,6 +51,8 @@ import ./make-test-python.nix (
|
|||
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
|
||||
services.postgresql.package = pkgs.postgresql_13;
|
||||
|
||||
services.discourse = {
|
||||
enable = true;
|
||||
inherit admin;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BJumblr";
|
||||
version = "1.4.2";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
|
||||
sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -27,16 +27,16 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = if isStereo
|
||||
then "2.76" # stereo
|
||||
else "2.75"; # normal
|
||||
then "2.77" # stereo
|
||||
else "2.76"; # normal
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip";
|
||||
sha256 = if isStereo
|
||||
then "12cz3780x5k047jqdv69n6rjgbfiwv67z850kfl4i37lxja432l7" # stereo
|
||||
else "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"; # normal
|
||||
then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo
|
||||
else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal
|
||||
};
|
||||
sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src";
|
||||
sourceRoot = "src";
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems unzip imagemagick ];
|
||||
buildInputs = [ SDL ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "GxPlugins.lv2";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal";
|
||||
sha256 = "02fksl8wr443ygwgcd1c2zab8kp67a6ps12k71ysqx7szv4zq877";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/brummer10/GxPlugins.lv2";
|
||||
description = "A set of extra lv2 plugins from the guitarix project";
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ];
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook python ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,17 @@
|
|||
{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
|
||||
, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, libcdio-paranoia
|
||||
, cdrdao
|
||||
, libsndfile
|
||||
, flac
|
||||
, sox
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
bins = [ libcdio-paranoia cdrdao flac sox util-linux ];
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whipper";
|
||||
version = "0.10.0";
|
||||
|
||||
|
|
@ -12,44 +22,43 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
|
||||
};
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools_scm
|
||||
docutils
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
pycdio
|
||||
pygobject3
|
||||
requests
|
||||
ruamel_yaml
|
||||
setuptools
|
||||
setuptools_scm
|
||||
discid
|
||||
pillow
|
||||
];
|
||||
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
twisted
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
inherit cdparanoia;
|
||||
})
|
||||
];
|
||||
] ++ bins;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath bins)
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
|
||||
'';
|
||||
|
||||
# some tests require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# disable tests that require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
substituteInPlace whipper/test/test_common_accurip.py \
|
||||
--replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse"
|
||||
HOME=$TMPDIR ${python3.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
--- a/whipper/program/cdparanoia.py
|
||||
+++ b/whipper/program/cdparanoia.py
|
||||
@@ -280,10 +280,10 @@
|
||||
|
||||
bufsize = 1024
|
||||
if self._overread:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, "--force-overread", ]
|
||||
else:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, ]
|
||||
if self._device:
|
||||
argv.extend(["--force-cdrom-device", self._device, ])
|
||||
@@ -560,7 +560,7 @@
|
||||
|
||||
def getCdParanoiaVersion():
|
||||
getter = common.VersionGetter('cd-paranoia',
|
||||
- ["cd-paranoia", "-V"],
|
||||
+ ["@cdparanoia@/bin/cdparanoia", "-V"],
|
||||
_VERSION_RE,
|
||||
"%(version)s %(release)s")
|
||||
|
||||
@@ -585,7 +585,7 @@
|
||||
def __init__(self, device=None):
|
||||
# cdparanoia -A *always* writes cdparanoia.log
|
||||
self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
|
||||
- self.command = ['cd-paranoia', '-A']
|
||||
+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
|
||||
if device:
|
||||
self.command += ['-d', device]
|
||||
|
|
@ -19,20 +19,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pika-backup";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "pika-backup";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cr3axfp15nzwmsqyz6j781qhr2gsn9p69m0jfzy89pl83d6vcz0";
|
||||
sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "1z0cbrkhxyzwf7vjjsvdppb7zhflpkw4m5cy90a2315nbll3hpbp";
|
||||
sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
Subject: Prevent "-dirty" from being erroneously added to the version
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index d36d1a3..00048fc 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -28,7 +28,7 @@ always:
|
||||
# Always rebuild because .git/HEAD is a symbolic ref one can't depend on
|
||||
StellarCoreVersion.h: always
|
||||
@vers=$$(cd "$(srcdir)" \
|
||||
- && git describe --always --dirty --tags 2>/dev/null \
|
||||
+ && git describe --always --tags 2>/dev/null \
|
||||
|| echo "$(PACKAGE) $(VERSION)"); \
|
||||
echo "#define STELLAR_CORE_VERSION \"$$vers\"" > $@~
|
||||
@if cmp -s $@~ $@; then rm -f $@~; else \
|
||||
|
|
@ -1,31 +1,30 @@
|
|||
{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git
|
||||
, bison, flex, postgresql }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git
|
||||
, bison, flex, postgresql, ripgrep }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stellar-core";
|
||||
version = "0.5.1";
|
||||
version = "17.0.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/stellar/stellar-core.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0ldw3qr0sajgam38z2w2iym0214ial6iahbzx3b965cw92n8n88z";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stellar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ngl8yjqb8xzhdwzlxzzxf14q2hgwy2ysb17sn5380rrn0jswin1";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake libtool git ];
|
||||
nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ];
|
||||
|
||||
propagatedBuildInputs = [ bison flex postgresql ];
|
||||
|
||||
patches = [ ./stellar-core-dirty-version.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
# Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on
|
||||
# having the .git directory present, so directly provide the version
|
||||
substituteInPlace src/Makefile.am --replace '$$vers' '${pname} ${version}';
|
||||
|
||||
# Everything needs to be staged in git because the build uses
|
||||
# `git ls-files` to search for source files to compile.
|
||||
git init
|
||||
git add .
|
||||
|
||||
./autogen.sh
|
||||
|
|
|
|||
|
|
@ -24,15 +24,15 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.4";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
# version 3.3.0 just uses 3.3 in its name
|
||||
# version 3.3.0 just uses 3.3 in its file name
|
||||
urls = [
|
||||
"https://tellico-project.org/files/tellico-${version}.tar.xz"
|
||||
"https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-YXMJrAkfehe3ox4WZ19igyFbXwtjO5wxN3bmgP01jPs=";
|
||||
sha256 = "sha256-+FFN6sO0mvlage8JazyrqNZk4onejz1XJPiOK3gnhWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -63,7 +63,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Collection management software, free and simple";
|
||||
homepage = "https://tellico-project.org/";
|
||||
license = with licenses; [ gpl2 gpl3 ];
|
||||
license = with licenses; [ gpl2Only gpl3Only lgpl2Only ];
|
||||
maintainers = with maintainers; [ numkem ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -165,14 +165,10 @@ let
|
|||
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
||||
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
|
||||
./patches/fix-missing-atspi2-dependency.patch
|
||||
] ++ optionals (chromiumVersionAtLeast "91") [
|
||||
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (chromiumVersionAtLeast "91") ''
|
||||
# Required for patchShebangs (unsupported):
|
||||
chmod -x third_party/webgpu-cts/src/tools/deno
|
||||
'' + ''
|
||||
postPatch = ''
|
||||
# remove unused third-party
|
||||
for lib in ${toString gnSystemLibraries}; do
|
||||
if [ -d "third_party/$lib" ]; then
|
||||
|
|
@ -191,6 +187,7 @@ let
|
|||
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
|
||||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
|
||||
fi
|
||||
chmod -x third_party/webgpu-cts/src/tools/deno
|
||||
|
||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
|
||||
|
|
|
|||
|
|
@ -44,19 +44,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "90.0.4430.212",
|
||||
"sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb",
|
||||
"sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7",
|
||||
"version": "91.0.4472.77",
|
||||
"sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5",
|
||||
"sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-02-09",
|
||||
"version": "2021-04-06",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
|
||||
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
|
||||
"rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
|
||||
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "90.0.4430.212-1",
|
||||
"sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8"
|
||||
"rev": "91.0.4472.77-1",
|
||||
"sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -440,10 +440,10 @@
|
|||
"owner": "DeterminateSystems",
|
||||
"provider-source-address": "registry.terraform.io/DeterminateSystems/hydra",
|
||||
"repo": "terraform-provider-hydra",
|
||||
"rev": "v0.1.1",
|
||||
"sha256": "093al7crxgjimy4nnxvb1xy9p7yc0c7gf2rgvql7y3y3n8bz5q1b",
|
||||
"rev": "v0.1.2",
|
||||
"sha256": "1a1ah5pzng9ik8f18kqx87fdh1c5wqbn2bsbhqrzd1nb8fc5xl03",
|
||||
"vendorSha256": null,
|
||||
"version": "0.1.1"
|
||||
"version": "0.1.2"
|
||||
},
|
||||
"ibm": {
|
||||
"owner": "IBM-Cloud",
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.18.10";
|
||||
version = "0.20.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY=";
|
||||
sha256 = "sha256-pUKKHrShED7yp5WSmHSbS+eiYs22Nm2/ouc2a8WYc38=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E=";
|
||||
};
|
||||
|
||||
# https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5
|
||||
# obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo
|
||||
# build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0
|
||||
# https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
patches = [
|
||||
# Post install tries to generate an icon cache & update the
|
||||
# desktop database. The gtk setup hook drop-icon-theme-cache.sh
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ in mkYarnPackage rec {
|
|||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--set-default MOZ_DBUS_REMOTE 1
|
||||
--add-flags "$out/share/element/electron"
|
||||
'';
|
||||
|
||||
# Do not attempt generating a tarball for element-web again.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ let
|
|||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.2.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.3.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "0hkl8h49565kncvczv5fv4gak55lycygwb8i8igkgc4my0ykzs2z";
|
||||
sha256 = "15lclxw3njih90zlh2n90v8ljg0wnglw5w8jrpa7rbd789yagvq7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -134,7 +134,7 @@ in stdenv.mkDerivation rec {
|
|||
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
|
||||
|
||||
autoPatchelf --no-recurse -- $out/lib/Signal/
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
|
||||
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
|
||||
'';
|
||||
|
||||
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catgirl";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3shSdeq4l6Y5DEJZEVMHAngp6vjnkPjzpLpcp407X/0=";
|
||||
sha256 = "0svpd2nqsr55ac98vczyhihs6pvgw7chspf6bdlwl98gch39dxif";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ctags pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From 5dd2593369645b11a9dc03e1930617d2f5dbd039 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Wed, 11 Nov 2020 11:48:49 +0100
|
||||
Subject: [PATCH] hardcode json file path
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
wee_slack.py | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/wee_slack.py b/wee_slack.py
|
||||
index a3d779c..5942289 100644
|
||||
--- a/wee_slack.py
|
||||
+++ b/wee_slack.py
|
||||
@@ -5136,13 +5136,7 @@ def create_slack_debug_buffer():
|
||||
|
||||
def load_emoji():
|
||||
try:
|
||||
- weechat_dir = w.info_get('weechat_dir', '')
|
||||
- weechat_sharedir = w.info_get('weechat_sharedir', '')
|
||||
- local_weemoji, global_weemoji = ('{}/weemoji.json'.format(path)
|
||||
- for path in (weechat_dir, weechat_sharedir))
|
||||
- path = (global_weemoji if os.path.exists(global_weemoji) and
|
||||
- not os.path.exists(local_weemoji) else local_weemoji)
|
||||
- with open(path, 'r') as ef:
|
||||
+ with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
|
||||
emojis = json.loads(ef.read())
|
||||
if 'emoji' in emojis:
|
||||
print_error('The weemoji.json file is in an old format. Please update it.')
|
||||
--
|
||||
2.29.0
|
||||
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wee-slack";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wee-slack";
|
||||
owner = "wee-slack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6Z/H15bKe0PKpNe9PCgc5mLOii3CILCAVon7EgzIkx8=";
|
||||
sha256 = "0xfklr0gsc9jgxfyrrb2j756lclz9g8imcb0pk0xgyj8mhsw23zk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
|
|||
src = ./libpath.patch;
|
||||
env = "${buildEnv {
|
||||
name = "wee-slack-env";
|
||||
paths = with python3Packages; [ websocket_client six ];
|
||||
paths = with python3Packages; [
|
||||
websocket_client
|
||||
six
|
||||
];
|
||||
}}/${python3Packages.python.sitePackages}";
|
||||
})
|
||||
./0001-hardcode-json-file-path.patch
|
||||
./load_weemoji_path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
diff --git a/wee_slack.py b/wee_slack.py
|
||||
index dbe6446..d1b7546 100644
|
||||
index e4716b4..f673b7c 100644
|
||||
--- a/wee_slack.py
|
||||
+++ b/wee_slack.py
|
||||
@@ -25,6 +25,8 @@ import random
|
||||
import socket
|
||||
import string
|
||||
@@ -31,6 +31,8 @@ import string
|
||||
# See https://github.com/numpy/numpy/issues/11925
|
||||
sys.modules["numpy"] = None
|
||||
|
||||
+sys.path.append('@env@')
|
||||
+
|
||||
from websocket import ABNF, create_connection, WebSocketConnectionClosedException
|
||||
|
||||
try:
|
||||
from websocket import ( # noqa: E402
|
||||
ABNF,
|
||||
create_connection,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/wee_slack.py b/wee_slack.py
|
||||
index e4716b4..ffd122d 100644
|
||||
--- a/wee_slack.py
|
||||
+++ b/wee_slack.py
|
||||
@@ -6092,19 +6092,7 @@ def create_slack_debug_buffer():
|
||||
|
||||
def load_emoji():
|
||||
try:
|
||||
- weechat_dir = w.info_get("weechat_data_dir", "") or w.info_get(
|
||||
- "weechat_dir", ""
|
||||
- )
|
||||
- weechat_sharedir = w.info_get("weechat_sharedir", "")
|
||||
- local_weemoji, global_weemoji = (
|
||||
- "{}/weemoji.json".format(path) for path in (weechat_dir, weechat_sharedir)
|
||||
- )
|
||||
- path = (
|
||||
- global_weemoji
|
||||
- if os.path.exists(global_weemoji) and not os.path.exists(local_weemoji)
|
||||
- else local_weemoji
|
||||
- )
|
||||
- with open(path, "r") as ef:
|
||||
+ with open("@out@/share/wee-slack/weemoji.json", "r") as ef:
|
||||
emojis = json.loads(ef.read())
|
||||
if "emoji" in emojis:
|
||||
print_error(
|
||||
|
|
@ -1,10 +1,12 @@
|
|||
{ stdenv, lib, fetchFromGitHub, installShellFiles, libiconv, ruby ? null }:
|
||||
{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused
|
||||
, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mblaze";
|
||||
version = "1.1";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -22,6 +24,24 @@ stdenv.mkDerivation rec {
|
|||
installShellCompletion contrib/_mblaze
|
||||
'' + lib.optionalString (ruby != null) ''
|
||||
install -Dt $out/bin contrib/msuck contrib/mblow
|
||||
|
||||
# The following wrappings are used to preserve the executable
|
||||
# names (the value of $0 in a script). The script mcom is
|
||||
# designed to be run directly or via symlinks such as mrep. Using
|
||||
# symlinks changes the value of $0 in the script, and makes it
|
||||
# behave differently. When using the wrapProgram tool, the resulting
|
||||
# wrapper breaks this behaviour. The following wrappers preserve it.
|
||||
|
||||
mkdir -p $out/wrapped
|
||||
for x in mcom mbnc mfwd mrep; do
|
||||
mv $out/bin/$x $out/wrapped
|
||||
makeWrapper $out/wrapped/$x $out/bin/$x \
|
||||
--argv0 $out/bin/$x \
|
||||
--prefix PATH : $out/bin \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
coreutils file gawk gnugrep gnused
|
||||
]}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
|
||||
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch
|
||||
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
|
||||
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
|
||||
}:
|
||||
|
|
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-32055.patch";
|
||||
url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch";
|
||||
sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cyrus_sasl gss gpgme libkrb5 libidn ncurses
|
||||
notmuch openssl perl lmdb
|
||||
|
|
|
|||
|
|
@ -721,25 +721,25 @@
|
|||
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-0.82.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
|
||||
sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
|
||||
name = "poppler-21.01.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz";
|
||||
sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3";
|
||||
md5 = "";
|
||||
md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
|
||||
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "postgresql-9.2.24.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";
|
||||
sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126";
|
||||
name = "postgresql-13.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
|
||||
sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
|
||||
md5 = "";
|
||||
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
|
||||
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "Python-3.7.7.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
|
||||
sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";
|
||||
name = "Python-3.7.10.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz";
|
||||
sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b";
|
||||
md5 = "";
|
||||
md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";
|
||||
md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "QR-Code-generator-1.4.0.tar.gz";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ rec {
|
|||
|
||||
major = "7";
|
||||
minor = "0";
|
||||
patch = "4";
|
||||
patch = "6";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
|
||||
sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
|
||||
sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
|
||||
sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,24 @@
|
|||
, gettext
|
||||
, gobject-introspection
|
||||
, gdk-pixbuf
|
||||
, texlive
|
||||
, imagemagick
|
||||
, perlPackages
|
||||
}:
|
||||
|
||||
let
|
||||
documentation_deps = [
|
||||
(texlive.combine {
|
||||
inherit (texlive) scheme-small wrapfig was;
|
||||
})
|
||||
xvfb-run
|
||||
imagemagick
|
||||
perlPackages.Po4a
|
||||
];
|
||||
in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
|
||||
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents;
|
||||
pname = "paperwork";
|
||||
|
||||
sourceRoot = "source/paperwork-gtk";
|
||||
|
|
@ -52,9 +66,16 @@ python3Packages.buildPythonApplication rec {
|
|||
for i in $site/data/paperwork_*.png; do
|
||||
ln -s $i $site/icon/out;
|
||||
done
|
||||
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share
|
||||
# build the user manual
|
||||
PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data
|
||||
for i in src/paperwork_gtk/model/help/out/*.pdf; do
|
||||
install -Dt $site/model/help/out $i
|
||||
done
|
||||
'';
|
||||
|
||||
checkInputs = [ xvfb-run dbus.daemon ];
|
||||
checkInputs = [ dbus.daemon ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
|
|
@ -62,7 +83,7 @@ python3Packages.buildPythonApplication rec {
|
|||
(lib.getBin gettext)
|
||||
which
|
||||
gdk-pixbuf # for the setup hook
|
||||
];
|
||||
] ++ documentation_deps;
|
||||
|
||||
buildInputs = [
|
||||
gnome.adwaita-icon-theme
|
||||
|
|
@ -78,13 +99,20 @@ python3Packages.buildPythonApplication rec {
|
|||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
# A few parts of chkdeps need to have a display and a dbus session, so we not
|
||||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
# resolution, because the Cairo test tries to draw a 200x200 window.
|
||||
preCheck = ''
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# A few parts of chkdeps need to have a display and a dbus session, so we not
|
||||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
# resolution, because the Cairo test tries to draw a 200x200 window.
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
$out/bin/paperwork-gtk chkdeps
|
||||
|
||||
# content of make test, without the dep on make install
|
||||
python -m unittest discover --verbose -s tests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
@ -98,6 +126,8 @@ python3Packages.buildPythonApplication rec {
|
|||
setuptools
|
||||
];
|
||||
|
||||
disallowedRequisites = documentation_deps;
|
||||
|
||||
meta = {
|
||||
description = "A personal document manager for scanned documents";
|
||||
homepage = "https://openpaper.work/";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,22 @@
|
|||
{fetchFromGitLab}:
|
||||
rec {
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
repo = "paperwork";
|
||||
group = "World";
|
||||
owner = "OpenPaperwork";
|
||||
rev = version;
|
||||
sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly";
|
||||
sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9";
|
||||
};
|
||||
sample_documents = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
repo = "paperwork-test-documents";
|
||||
group = "World";
|
||||
owner = "OpenPaperwork";
|
||||
# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG
|
||||
rev = "1.0";
|
||||
sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
# Softmaker Office or when the upstream archive was replaced and
|
||||
# nixpkgs is not in sync yet.
|
||||
, officeVersion ? {
|
||||
version = "1030";
|
||||
version = "1032";
|
||||
edition = "2021";
|
||||
hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE=";
|
||||
hash = "sha256-LchSqLVBdkmWJQ8hCEvtwRPgIUSDE0URKPzCkEexGbc=";
|
||||
}
|
||||
|
||||
, ... } @ args:
|
||||
|
|
|
|||
|
|
@ -1,20 +1,17 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
|
||||
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects
|
||||
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }:
|
||||
let
|
||||
|
||||
version = "2.2";
|
||||
|
||||
in mkDerivation {
|
||||
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123
|
||||
} :
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "welle-io";
|
||||
inherit version;
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlbrechtL";
|
||||
repo = "welle.io";
|
||||
rev = "v${version}";
|
||||
sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa";
|
||||
sha256 = "1xl1lanw0xgmgks67dbfb2h52jxnrd1i2zik56v0q8dwsr7f0daw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,11 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "leanprover-community";
|
||||
repo = "lean";
|
||||
rev = "v${version}";
|
||||
# lean's version string contains the commit sha1 it was built
|
||||
# from. this is then used to check whether an olean file should be
|
||||
# rebuilt. don't use a tag as rev because this will get replaced into
|
||||
# src/githash.h.in in preConfigure.
|
||||
rev = "a5822ea47ebc52eec6323d8f1b60f6ec025daf99";
|
||||
sha256 = "sha256-gJhbkl19iilNyfCt2TfPmghYA3yCjg6kS+yk/x/k14Y=";
|
||||
};
|
||||
|
||||
|
|
@ -20,6 +24,13 @@ stdenv.mkDerivation rec {
|
|||
# library.
|
||||
doCheck = true;
|
||||
|
||||
preConfigure = assert builtins.stringLength src.rev == 40; ''
|
||||
substituteInPlace src/githash.h.in \
|
||||
--subst-var-by GIT_SHA1 "${src.rev}"
|
||||
substituteInPlace library/init/version.lean.in \
|
||||
--subst-var-by GIT_SHA1 "${src.rev}"
|
||||
'';
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
|||
mv html/en/_static{,.tmp}
|
||||
for _dir in `find -name _static` ; do
|
||||
rm -r $_dir
|
||||
ln -s html/en/_static $_dir
|
||||
ln -rs html/en/_static $_dir
|
||||
done
|
||||
mv html/en/_static{.tmp,}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -16,9 +16,6 @@ stdenv.mkDerivation rec {
|
|||
./undefined_behavior.patch
|
||||
];
|
||||
|
||||
# patch needs to updated due to version bump
|
||||
#CXXFLAGS = "-Werror=return-type";
|
||||
|
||||
preConfigure =
|
||||
# Fix F77LD to workaround for a following build error:
|
||||
#
|
||||
|
|
@ -48,8 +45,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optional (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc";
|
||||
NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a";
|
||||
sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8";
|
||||
};
|
||||
|
||||
cargoSha256 = "1w1w98vhjd561mkiwv89zb8k0nf1p5fc67jb5dddwg9nj6mqjrhp";
|
||||
cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script
|
||||
, python3, git, gnupg, less
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.14.5";
|
||||
version = "2.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
|
|
@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";
|
||||
};
|
||||
|
||||
patches = [ ./import-ssl-module.patch ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
|
|
@ -25,8 +23,12 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp repo $out/bin/repo
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Important runtime dependencies
|
||||
|
|
@ -35,6 +37,12 @@ stdenv.mkDerivation rec {
|
|||
"${lib.makeBinPath [ git gnupg less ]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "gitRepo";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Android's repo management tool";
|
||||
longDescription = ''
|
||||
|
|
@ -45,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://android.googlesource.com/tools/repo";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/repo b/repo
|
||||
index 8b05def..f394b3e 100755
|
||||
--- a/repo
|
||||
+++ b/repo
|
||||
@@ -236,6 +236,7 @@ import optparse
|
||||
import re
|
||||
import shutil
|
||||
import stat
|
||||
+import ssl
|
||||
|
||||
if sys.version_info[0] == 3:
|
||||
import urllib.request
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, fetchFromGitHub, appstream-glib, desktop-file-utils, glib
|
||||
, gobject-introspection, gst_all_1, gtk3, libhandy, librsvg, meson, ninja
|
||||
, gobject-introspection, gst_all_1, gtk4, libadwaita, librsvg, meson, ninja
|
||||
, pkg-config, python3, wrapGAppsHook }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kooha";
|
||||
version = "1.1.3";
|
||||
version = "1.2.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeaDve";
|
||||
repo = "Kooha";
|
||||
rev = "v${version}";
|
||||
sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36";
|
||||
sha256 = "1qwbzdn0n1nxcfci1bhhkfchdhw5yz74fdvsa84cznyyx2jils8w";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk3
|
||||
libhandy
|
||||
gtk4
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
|
||||
|
|
@ -48,6 +48,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/kooha --help
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple screen recorder";
|
||||
homepage = "https://github.com/SeaDve/Kooha";
|
||||
|
|
|
|||
|
|
@ -32,10 +32,9 @@ python3Packages.buildPythonApplication rec {
|
|||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
] ++ optional spiceSupport spice-gtk;
|
||||
|
||||
propagatedBuildInputs = with python3Packages;
|
||||
[
|
||||
pygobject3 ipaddress libvirt libxml2 requests
|
||||
];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3 ipaddress libvirt libxml2 requests cdrtools
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
|
||||
|
|
|
|||
|
|
@ -41,7 +41,17 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
# Note: only openblas and not atlas part of this Nix expression
|
||||
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
|
||||
# to get a hint howto setup atlas instead of openblas
|
||||
buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ];
|
||||
buildInputs = [
|
||||
llvmPackages.llvm
|
||||
llvmPackages.lld
|
||||
llvmPackages.openmp
|
||||
llvmPackages.libclang
|
||||
libpng
|
||||
libjpeg
|
||||
mesa
|
||||
eigen
|
||||
openblas
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babashka";
|
||||
version = "0.4.1";
|
||||
version = "0.4.3";
|
||||
|
||||
reflectionJson = fetchurl {
|
||||
name = "reflection.json";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-tKMxi0umMmM99NusSSE9tT95TBcfXm1lfo95fQRUBrs=";
|
||||
sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -110,9 +110,15 @@ stdenv.mkDerivation rec {
|
|||
- Batteries included (tools.cli, cheshire, ...)
|
||||
- Library support via popular tools like the clojure CLI
|
||||
'';
|
||||
homepage = "https://github.com/borkdude/babashka";
|
||||
homepage = "https://github.com/babashka/babashka";
|
||||
license = licenses.epl10;
|
||||
platforms = graalvm11-ce.meta.platforms;
|
||||
maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ];
|
||||
maintainers = with maintainers; [
|
||||
bandresen
|
||||
bhougland
|
||||
DerGuteMoritz
|
||||
jlesquembre
|
||||
thiagokokada
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "arrow-cpp";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||
sha256 = "1bj9jr0pgq9f2nyzqiyj3cl0hcx3c83z2ym6rpdkp59ff2zx0caa";
|
||||
sha256 = "0vl926i6jvsvj5vigdgqzp9v1i1h5zzj1abqr6qwc9drfsibzk3m";
|
||||
};
|
||||
sourceRoot = "apache-arrow-${version}/cpp";
|
||||
|
||||
|
|
@ -146,11 +146,11 @@ in stdenv.mkDerivation rec {
|
|||
--exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A cross-language development platform for in-memory data";
|
||||
homepage = "https://arrow.apache.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ tobim veprbl ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tobim veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libtool }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libtool }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "getdata";
|
||||
version = "0.10.0";
|
||||
|
|
@ -7,6 +7,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch";
|
||||
sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libtool ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200
|
||||
+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200
|
||||
@@ -333,7 +333,7 @@
|
||||
# So, try first to find the CMake module provided by libxml2 package, then fallback
|
||||
# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially
|
||||
# in static build case).
|
||||
-find_package(LibXml2 QUIET NO_MODULE)
|
||||
+find_package(LibXml2 QUIET MODULE)
|
||||
if(DEFINED LIBXML2_VERSION_STRING)
|
||||
set(LIBXML2_FOUND ON)
|
||||
set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
|
||||
Seulement dans b: good.patch
|
||||
|
|
@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7";
|
||||
};
|
||||
|
||||
# Revert after https://github.com/NixOS/nixpkgs/issues/125008 is
|
||||
# fixed properly
|
||||
patches = [ ./cmake-fix-libxml2-find-package.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
flex
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxlsxwriter";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmcnamara";
|
||||
repo = "libxlsxwriter";
|
||||
rev = "RELEASE_${version}";
|
||||
sha256 = "1jjmwg1mk7pvf36q30rng42qphgz6qdjvn96agrym2q0hhwxc99v";
|
||||
sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, perl, gfortran
|
||||
, openssh, hwloc, autoconf, automake, libtool
|
||||
, openssh, hwloc
|
||||
# either libfabric or ucx work for ch4backend on linux. On darwin, neither of
|
||||
# these libraries currently build so this argument is ignored on Darwin.
|
||||
, ch4backend
|
||||
|
|
@ -11,29 +11,13 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpich";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
|
||||
sha256 = "09wpfw9lsrc84vcmfw94razd4xv4znx4mmg7rqmljvgg0jc96dl8";
|
||||
sha256 = "1gw7qpb27mhsj7ip0hhljshgpwvz2hmyhizhlp6793afp2lbw6aw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Reverts an upstream change that causes json-c test to fail
|
||||
./jsonc-test.patch
|
||||
];
|
||||
|
||||
# Required for the json-c patch
|
||||
nativeBuildInputs = [ autoconf automake libtool ];
|
||||
|
||||
# Update configure after patch
|
||||
postPatch = ''
|
||||
cd modules/json-c
|
||||
./autogen.sh
|
||||
cd ../..
|
||||
'';
|
||||
|
||||
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
"--enable-sharedlib"
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
--- b/modules/json-c/configure.ac
|
||||
+++ a/modules/json-c/configure.ac
|
||||
@@ -75,7 +75,7 @@
|
||||
AC_FUNC_VPRINTF
|
||||
AC_FUNC_MEMCMP
|
||||
AC_CHECK_FUNCS([realloc])
|
||||
+AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open strncasecmp setlocale)
|
||||
-AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf open strncasecmp setlocale)
|
||||
AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]])
|
||||
AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]])
|
||||
AC_CHECK_DECLS([isnan], [], [], [[#include <math.h>]])
|
||||
--- b/modules/json-c/json_pointer.c
|
||||
+++ a/modules/json-c/json_pointer.c
|
||||
@@ -208,7 +208,7 @@
|
||||
}
|
||||
|
||||
va_start(args, path_fmt);
|
||||
+ rc = vasprintf(&path_copy, path_fmt, args);
|
||||
- rc = json_vasprintf(&path_copy, path_fmt, args);
|
||||
va_end(args);
|
||||
|
||||
if (rc < 0)
|
||||
@@ -287,7 +287,7 @@
|
||||
|
||||
/* pass a working copy to the recursive call */
|
||||
va_start(args, path_fmt);
|
||||
+ rc = vasprintf(&path_copy, path_fmt, args);
|
||||
- rc = json_vasprintf(&path_copy, path_fmt, args);
|
||||
va_end(args);
|
||||
|
||||
if (rc < 0)
|
||||
--- b/modules/json-c/printbuf.c
|
||||
+++ a/modules/json-c/printbuf.c
|
||||
@@ -129,7 +129,7 @@
|
||||
would have been written - this code handles both cases. */
|
||||
if(size == -1 || size > 127) {
|
||||
va_start(ap, msg);
|
||||
+ if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
|
||||
- if((size = json_vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
|
||||
va_end(ap);
|
||||
printbuf_memappend(p, t, size);
|
||||
free(t);
|
||||
--- b/modules/json-c/vasprintf_compat.h
|
||||
+++ a/modules/json-c/vasprintf_compat.h
|
||||
@@ -8,8 +8,9 @@
|
||||
|
||||
#include "snprintf_compat.h"
|
||||
|
||||
+#if !defined(HAVE_VASPRINTF)
|
||||
/* CAW: compliant version of vasprintf */
|
||||
+static int vasprintf(char **buf, const char *fmt, va_list ap)
|
||||
-static int json_vasprintf(char **buf, const char *fmt, va_list ap)
|
||||
{
|
||||
#ifndef WIN32
|
||||
static char _T_emptybuffer = '\0';
|
||||
@@ -40,5 +41,6 @@
|
||||
|
||||
return chars;
|
||||
}
|
||||
+#endif /* !HAVE_VASPRINTF */
|
||||
|
||||
#endif /* __vasprintf_compat_h */
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nv-codec-headers";
|
||||
version = "10.0.26.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
|
||||
rev = "n${version}";
|
||||
sha256 = "0n5jlwjfv5irx1if1g0n52m279bw7ab6bd3jz2v4vwg9cdzbxx85";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "FFmpeg version of headers for NVENC";
|
||||
homepage = "https://ffmpeg.org/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.MP2E ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -65,10 +65,9 @@ stdenv.mkDerivation rec {
|
|||
cairo
|
||||
lcms
|
||||
curl
|
||||
nss
|
||||
] ++ lib.optionals qt5Support [
|
||||
qtbase
|
||||
] ++ lib.optionals utils [
|
||||
nss
|
||||
] ++ lib.optionals introspectionSupport [
|
||||
gobject-introspection
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qhull";
|
||||
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-djUO3qzY8ch29AuhY3Bn1ajxWZ4/W70icWVrxWRAxRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qhull.org/";
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@ plugins: let
|
|||
|
||||
getRecursivePropagatedBuildInputs = pkgs: lib.flatten
|
||||
(map
|
||||
(pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs))
|
||||
(pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs;
|
||||
in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs))
|
||||
pkgs);
|
||||
|
||||
deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins);
|
||||
deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins));
|
||||
|
||||
pluginsEnv = buildEnv {
|
||||
name = "vapoursynth-plugins-env";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,86 @@
|
|||
diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
|
||||
--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -87,7 +87,7 @@
|
||||
if (!m_store.createSharedMemoryHandle(handle))
|
||||
return;
|
||||
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
uint64_t dataSize = handle.size();
|
||||
#else
|
||||
uint64_t dataSize = 0;
|
||||
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
|
||||
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400
|
||||
@@ -26,8 +26,6 @@
|
||||
#include "config.h"
|
||||
#include "IPCSemaphore.h"
|
||||
|
||||
-#if !OS(DARWIN)
|
||||
-
|
||||
namespace IPC {
|
||||
|
||||
Semaphore::Semaphore() = default;
|
||||
@@ -46,5 +44,3 @@
|
||||
}
|
||||
|
||||
}
|
||||
-
|
||||
-#endif
|
||||
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
|
||||
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <wtf/Optional.h>
|
||||
#include <wtf/Seconds.h>
|
||||
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
#include <mach/semaphore.h>
|
||||
#include <wtf/MachSendRight.h>
|
||||
#endif
|
||||
@@ -51,7 +51,7 @@
|
||||
void encode(Encoder&) const;
|
||||
static Optional<Semaphore> decode(Decoder&);
|
||||
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
explicit Semaphore(MachSendRight&&);
|
||||
|
||||
void signal();
|
||||
@@ -64,7 +64,7 @@
|
||||
#endif
|
||||
|
||||
private:
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
void destroy();
|
||||
MachSendRight m_sendRight;
|
||||
semaphore_t m_semaphore { SEMAPHORE_NULL };
|
||||
Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
|
||||
diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
|
||||
--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
bool isNull() const;
|
||||
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
size_t size() const { return m_size; }
|
||||
#endif
|
||||
|
||||
diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
|
||||
--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500
|
||||
+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -119,7 +119,7 @@
|
||||
return;
|
||||
|
||||
// FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
uint64_t dataSize = handle.size();
|
||||
#else
|
||||
uint64_t dataSize = 0;
|
||||
Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, runCommandNoCC
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
, python3
|
||||
, ruby
|
||||
|
|
@ -34,6 +36,7 @@
|
|||
, libidn
|
||||
, libedit
|
||||
, readline
|
||||
, sdk
|
||||
, libGL
|
||||
, libGLU
|
||||
, mesa
|
||||
|
|
@ -78,6 +81,32 @@ stdenv.mkDerivation rec {
|
|||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
./libglvnd-headers.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff";
|
||||
sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA=";
|
||||
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||
})
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225856
|
||||
(fetchpatch {
|
||||
url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
|
||||
sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU=";
|
||||
excludes = [ "Source/WebCore/ChangeLog" ];
|
||||
})
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225850
|
||||
./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774
|
||||
(fetchpatch {
|
||||
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776";
|
||||
sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ=";
|
||||
excludes = [ "Source/WTF/ChangeLog" ];
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778";
|
||||
sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo=";
|
||||
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
|
|
@ -96,6 +125,7 @@ stdenv.mkDerivation rec {
|
|||
gperf
|
||||
ninja
|
||||
perl
|
||||
perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
|
||||
pkg-config
|
||||
python3
|
||||
ruby
|
||||
|
|
@ -143,6 +173,12 @@ stdenv.mkDerivation rec {
|
|||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
libedit
|
||||
readline
|
||||
# Pull a header that contains a definition of proc_pid_rusage().
|
||||
# (We pick just that one because using the other headers from `sdk` is not
|
||||
# compatible with our C++ standard library)
|
||||
(runCommandNoCC "${pname}_headers" {} ''
|
||||
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||
'')
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bubblewrap
|
||||
libseccomp
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "tyxml";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
|
||||
sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi";
|
||||
sha256 = "0s30f72m457c3gbdmdwbx7ls9zg806nvm83aiz9qkpglbppwr6n6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ uutf re ];
|
||||
|
|
@ -19,7 +19,7 @@ buildDunePackage rec {
|
|||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [
|
||||
gal_bolle vbgl
|
||||
];
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
checkPhase = ''
|
||||
pushd tests
|
||||
py.test ./.
|
||||
py.test -Wignore::DeprecationWarning ./.
|
||||
popd
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook, click, sortedcontainers, pyyaml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cock";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click sortedcontainers pyyaml ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pohmelie/cock";
|
||||
description = "Configuration file with click";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cocotb-bus";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cc9b0bb00c95061a67f650caf96e3a294bb74ef437124dea456dd9e2a9431854";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove circular dependency cocotb from setup.py
|
||||
substituteInPlace setup.py --replace '"cocotb>=1.5.0.dev,<2.0"' ""
|
||||
'';
|
||||
|
||||
# tests require cocotb, disable for now to avoid circular dependency
|
||||
doCheck = false;
|
||||
|
||||
# checkPhase = ''
|
||||
# export PATH=$out/bin:$PATH
|
||||
# make test
|
||||
# '';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pre-packaged testbenching tools and reusable bus interfaces for cocotb";
|
||||
homepage = "https://github.com/cocotb/cocotb-bus";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,19 +1,31 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, setuptools, swig, verilog }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, cocotb-bus
|
||||
, pytest
|
||||
, swig
|
||||
, verilog
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cocotb";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02bw2i03vd4rcvdk10qdjl2lbvvy81cn9qpr8vzq8cm9h45689mv";
|
||||
# - we need to use the tarball from PyPi
|
||||
# or the full git checkout (with .git)
|
||||
# - using fetchFromGitHub will cause a build failure,
|
||||
# because it does not include required metadata
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9f4f3e6eb9caeb479e98d604770645b57469cd25b39e28df1916ffcd593efbe6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
buildInputs = [ setuptools ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs bin/*.py
|
||||
|
|
@ -25,16 +37,14 @@ buildPythonPackage rec {
|
|||
do
|
||||
substituteInPlace $f --replace 'shell which' 'shell command -v'
|
||||
done
|
||||
|
||||
# remove circular dependency cocotb-bus from setup.py
|
||||
substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
|
||||
'';
|
||||
|
||||
checkInputs = [ swig verilog ];
|
||||
checkInputs = [ cocotb-bus pytest swig verilog ];
|
||||
|
||||
checkPhase = ''
|
||||
# test expected failures actually pass because of a fix in our icarus version
|
||||
# https://github.com/cocotb/cocotb/issues/1952
|
||||
substituteInPlace tests/test_cases/test_discovery/test_discovery.py \
|
||||
--replace 'def access_single_bit' $'def foo(x): pass\ndef foo'
|
||||
|
||||
export PATH=$out/bin:$PATH
|
||||
make test
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -5,19 +5,21 @@
|
|||
, setuptools-scm
|
||||
, toml
|
||||
, importlib-metadata
|
||||
, cssselect
|
||||
, lxml
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cssutils";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf";
|
||||
sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +32,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
cssselect
|
||||
lxml
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
@ -38,6 +42,12 @@ buildPythonPackage rec {
|
|||
# access network
|
||||
"test_parseUrl"
|
||||
"encutils"
|
||||
"website.logging"
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
# AttributeError: module 'importlib.resources' has no attribute 'files'
|
||||
"test_parseFile"
|
||||
"test_parseString"
|
||||
"test_combine"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cssutils" ];
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@
|
|||
, fetchFromGitHub
|
||||
, pyjwt
|
||||
, djangorestframework
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-jwt";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Styria-Digital";
|
||||
repo = "django-rest-framework-jwt";
|
||||
rev = version;
|
||||
sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7";
|
||||
sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.0.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28";
|
||||
sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va";
|
||||
};
|
||||
|
||||
# No tests included in archive
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@ buildPythonPackage rec {
|
|||
"test_mem_vec_diff_clusters"
|
||||
"test_all_points_mem_vec_diff_clusters"
|
||||
"test_approx_predict_diff_clusters"
|
||||
# another flaky test https://github.com/scikit-learn-contrib/hdbscan/issues/421
|
||||
"test_hdbscan_boruvka_balltree_matches"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@ buildPythonPackage rec {
|
|||
"test_delete"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications.";
|
||||
homepage = "https://github.com/jupyter-server/jupyter_server";
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ buildPythonPackage rec {
|
|||
"test_get_language_pack"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "JupyterLab Server";
|
||||
homepage = "https://jupyter.org";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, python
|
||||
, pythonOlder
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, bubblewrap
|
||||
, exiftool
|
||||
|
|
@ -49,6 +50,12 @@ buildPythonPackage rec {
|
|||
./executable-name.patch
|
||||
# hardcode path to mat2 executable
|
||||
./tests.patch
|
||||
# remove for next release
|
||||
(fetchpatch {
|
||||
name = "fix-tests-ffmpeg-4.4.patch";
|
||||
url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch";
|
||||
sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,16 +1,21 @@
|
|||
{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
|
||||
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||
{ lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo
|
||||
, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||
, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
|
||||
, certifi, pillow
|
||||
, enableGhostscript ? true, ghostscript, gtk3
|
||||
, enableGtk3 ? false, cairo
|
||||
# darwin has its own "MacOSX" backend
|
||||
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11
|
||||
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter
|
||||
, enableQt ? false, pyqt5
|
||||
# required for headless detection
|
||||
, libX11, wayland
|
||||
, Cocoa
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
let
|
||||
interactive = enableTk || enableGtk3 || enableQt;
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.4.1";
|
||||
pname = "matplotlib";
|
||||
|
|
@ -62,8 +67,14 @@ buildPythonPackage rec {
|
|||
let
|
||||
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
|
||||
in
|
||||
lib.optionalString enableTk
|
||||
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
|
||||
lib.optionalString enableTk ''
|
||||
sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py
|
||||
'' + lib.optionalString (stdenv.isLinux && interactive) ''
|
||||
# fix paths to libraries in dlopen calls (headless detection)
|
||||
substituteInPlace src/_c_internal_utils.c \
|
||||
--replace libX11.so.6 ${libX11}/lib/libX11.so.6 \
|
||||
--replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
|
||||
'';
|
||||
|
||||
# Matplotlib needs to be built against a specific version of freetype in
|
||||
# order for all of the tests to pass.
|
||||
|
|
@ -72,6 +83,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python plotting library, making publication quality plots";
|
||||
homepage = "https://matplotlib.org/";
|
||||
license = with licenses; [ psfl bsd0 ];
|
||||
maintainers = with maintainers; [ lovek323 veprbl ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ buildPythonPackage rec {
|
|||
pytest-tornasync
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Jupyter lab environment notebook server extension.";
|
||||
license = with licenses; [ bsd3 ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrituals";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "milanmeu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hrwhk3kpvdg78fgnvhmnnh3wprdv10j8jqjm4ly64chr8cdi6f2";
|
||||
sha256 = "sha256-oAxQRGP6GxiidnGshSJZEh2RD3XsZ/7kFGwcqaYaBnM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
|
|
|||
|
|
@ -66,10 +66,30 @@ buildPythonPackage rec {
|
|||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
|
||||
# Skip test_feature_importance_regression - does web fetch
|
||||
disabledTests = [ "test_feature_importance_regression" ];
|
||||
disabledTests = [
|
||||
# Skip test_feature_importance_regression - does web fetch
|
||||
"test_feature_importance_regression"
|
||||
|
||||
pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" "--pyargs" "sklearn" ];
|
||||
# failing on macos
|
||||
"check_regressors_train"
|
||||
"check_classifiers_train"
|
||||
"xfail_ignored_in_check_estimator"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# verbose build outputs needed to debug hard-to-reproduce hydra failures
|
||||
"-v"
|
||||
"--pyargs" "sklearn"
|
||||
|
||||
# NuSVC memmap tests causes segmentation faults in certain environments
|
||||
# (e.g. Hydra Darwin machines) related to a long-standing joblib issue
|
||||
# (https://github.com/joblib/joblib/issues/563). See also:
|
||||
# https://github.com/scikit-learn/scikit-learn/issues/17582
|
||||
# Since we are overriding '-k' we need to include the 'disabledTests' from above manually.
|
||||
"-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'"
|
||||
|
||||
"-n" "$NIX_BUILD_CORES"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
cd $TMPDIR
|
||||
|
|
@ -89,6 +109,6 @@ buildPythonPackage rec {
|
|||
"https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}";
|
||||
homepage = "https://scikit-learn.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ davhau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "smhi-pkg";
|
||||
version = "1.0.14";
|
||||
version = "1.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joysoftware";
|
||||
repo = "pypi_smhi";
|
||||
rev = version;
|
||||
sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3";
|
||||
sha256 = "sha256-tBNmfn2hBkS36B9zKDP+TgqeumbgzBVDiJ5L54RaSc8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
, cmake
|
||||
, scipy
|
||||
|
|
@ -56,6 +57,11 @@ buildPythonPackage {
|
|||
disabledTests = [
|
||||
"test_cli_binary_classification"
|
||||
"test_model_compatibility"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# fails to connect to the com.apple.fonts daemon in sandboxed mode
|
||||
"test_plotting"
|
||||
"test_sklearn_plotting"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
, ruby
|
||||
, lua
|
||||
, capstone
|
||||
, fetchpatch
|
||||
, useX11 ? false
|
||||
, rubyBindings ? false
|
||||
, pythonBindings ? false
|
||||
|
|
@ -37,6 +38,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0n3k190qjhdlj10fjqijx6ismz0g7fk28i83j0480cxdqgmmlbxc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix for CVE-2021-32613
|
||||
(fetchpatch {
|
||||
url = "https://github.com/radareorg/radare2/commit/5e16e2d1c9fe245e4c17005d779fde91ec0b9c05.patch";
|
||||
sha256 = "sha256-zCFNn968buLuSqfUT5E+72qz0l1tA3fEUQIxJl2nd3I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-32613.patch";
|
||||
url = "https://github.com/radareorg/radare2/commit/049de62730f4954ef9a642f2eeebbca30a8eccdc.patch";
|
||||
sha256 = "sha256-s8SWGuSQ6fxDCybtjO2ZW8w7H6mr+AuzVLL6dw+XKDw=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:
|
||||
|
||||
let
|
||||
version = "3.16.0";
|
||||
version = "3.16.1";
|
||||
owner = "erlang";
|
||||
deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };
|
||||
rebar3 = stdenv.mkDerivation rec {
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
inherit owner;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yqvm37l5rn5dyg4sc2hv47930s2524qrdpnjwy3zqa27r7k5n36";
|
||||
sha256 = "0dhwlx7zykf9y3znk2k8fxrq5j43jy3c3gd76k74q34p1xbajgzr";
|
||||
};
|
||||
|
||||
buildInputs = [ erlang ];
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ GEM
|
|||
specs:
|
||||
parallel (1.20.1)
|
||||
pg (1.2.3)
|
||||
pgsync (0.6.6)
|
||||
pgsync (0.6.7)
|
||||
parallel
|
||||
pg (>= 0.18.2)
|
||||
slop (>= 4.8.2)
|
||||
tty-spinner
|
||||
slop (4.8.2)
|
||||
slop (4.9.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
|
|
|
|||
|
|
@ -25,20 +25,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr";
|
||||
sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
};
|
||||
slop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
|
||||
sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.8.2";
|
||||
version = "4.9.0";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ buildPythonApplication rec {
|
|||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://doc.devpi.net";
|
||||
description = "Client for devpi, a pypi index server and packaging meta tool";
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ python3Packages.buildPythonApplication rec {
|
|||
"TestMirrorIndexThings"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "http://doc.devpi.net";
|
||||
description = "Github-style pypi index server and packaging meta tool";
|
||||
|
|
|
|||
|
|
@ -86,32 +86,32 @@ rec {
|
|||
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
|
||||
};
|
||||
|
||||
electron_10 = mkElectron "10.4.5" {
|
||||
x86_64-linux = "d7f6203d09b4419262e985001d4c4f6c1fdfa3150eddb0708df9e124bebd0503";
|
||||
x86_64-darwin = "e3ae7228010055b1d198d8dbaf0f34882d369d8caf76206a59f198301a3f3913";
|
||||
i686-linux = "dd6abc0dc00d8f9d0e31c8f2bb70f7bbbaec58af4c446f8b493bbae9a9428e2f";
|
||||
armv7l-linux = "86bc5f9d3dc94d19e847bf10ab22d98926b616d9febcbdceafd30e35b8f2b2db";
|
||||
aarch64-linux = "655b36d68332131250f7496de0bb03a1e93f74bb5fc4b4286148855874673dcd";
|
||||
headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk";
|
||||
electron_10 = mkElectron "10.4.7" {
|
||||
x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995";
|
||||
x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb";
|
||||
i686-linux = "dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79";
|
||||
armv7l-linux = "56f11ed14f8a620650d31c21ebd095ce59ef4286c98276802b18f9cc85560ddd";
|
||||
aarch64-linux = "0550584518c8e98fe1113706c10fd7456ec519f7aa6867fbff17c8913327d758";
|
||||
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
|
||||
};
|
||||
|
||||
electron_11 = mkElectron "11.4.6" {
|
||||
x86_64-linux = "03932a0b3328a00e7ed49947c70143b7b3455a3c1976defab2f74127cdae43e9";
|
||||
x86_64-darwin = "47de03b17ab20213c95d5817af3d7db2b942908989649202efdcd1d566dd24c3";
|
||||
i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace";
|
||||
armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857";
|
||||
aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc";
|
||||
aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5";
|
||||
headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk";
|
||||
electron_11 = mkElectron "11.4.7" {
|
||||
x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539";
|
||||
x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043";
|
||||
i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc";
|
||||
armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7";
|
||||
aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323";
|
||||
aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622";
|
||||
headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry";
|
||||
};
|
||||
|
||||
electron_12 = mkElectron "12.0.7" {
|
||||
x86_64-linux = "335b77b35361fac4e2df1b7e8de5cf055e0a1a2065759cb2dd4508e8a77949fa";
|
||||
x86_64-darwin = "c3238c9962c5ad0f9de23c9314f07e03410d096d7e9f9d91016dab2856606a9e";
|
||||
i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06";
|
||||
armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a";
|
||||
aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71";
|
||||
aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488";
|
||||
headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb";
|
||||
electron_12 = mkElectron "12.0.9" {
|
||||
x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d";
|
||||
x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872";
|
||||
i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6";
|
||||
armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898";
|
||||
aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9";
|
||||
aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb";
|
||||
headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ curl libgit2 openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doCheck = true;
|
||||
# thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"'
|
||||
# __darwinAllowLocalNetworking does not fix the panic
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate Bazel BUILD files from Cargo dependencies";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terraria-server";
|
||||
version = "1.4.2.2";
|
||||
version = "1.4.2.3";
|
||||
urlVersion = lib.replaceChars [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://terraria.org/system/dedicated_servers/archives/000/000/045/original/terraria-server-${urlVersion}.zip";
|
||||
sha256 = "0jz79yidnri6hrqp2aqbi8hg0w3k4nrnfbvxgy5q612fr04g6nsw";
|
||||
url = "https://terraria.org/system/dedicated_servers/archives/000/000/046/original/terraria-server-${urlVersion}.zip";
|
||||
sha256 = "0qm4pbm1d9gax47fk4zhw9rcxvajxs36w7dghirli89i994r7g8j";
|
||||
};
|
||||
|
||||
buildInputs = [ file ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python37, retroarch
|
||||
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
|
||||
, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
|
||||
, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
|
||||
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
|
||||
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
|
||||
, buildPackages }:
|
||||
|
||||
|
|
@ -831,15 +831,24 @@ in with lib.licenses;
|
|||
|
||||
ppsspp = mkLibRetroCore {
|
||||
core = "ppsspp";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hrydgard/ppsspp";
|
||||
rev = "bf1777f7d3702e6a0f71c7ec1fc51976e23c2327";
|
||||
sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v1.11";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-vfp/vacIItlPP5dR7jzDT7oOUNFnjvvdR46yi79EJKU=";
|
||||
};
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix_ffmpeg_4.4.patch"; # to be removed with next release
|
||||
url = "https://patch-diff.githubusercontent.com/raw/hrydgard/ppsspp/pull/14176.patch";
|
||||
sha256 = "sha256-ecDoOydaLfL6+eFpahcO1TnRl866mZZVHlr6Qrib1mo=";
|
||||
})
|
||||
];
|
||||
description = "ppsspp libretro port";
|
||||
license = gpl2;
|
||||
extraNativeBuildInputs = [ cmake pkg-config ];
|
||||
extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ];
|
||||
extraNativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ];
|
||||
makefile = "Makefile";
|
||||
cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
|
||||
postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg_3, glew, pcre
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg, glew, pcre
|
||||
, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm
|
||||
, llvm, glibmm
|
||||
}:
|
||||
|
|
@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's/SET(ETCDIR "\/etc")/SET(ETCDIR "etc")/g' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [
|
||||
curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
|
||||
curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
|
||||
pango xz nasm llvm glibmm
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source Flash Player implementation";
|
||||
homepage = "https://lightspark.github.io/";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jchw ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
|
||||
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
|
||||
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
|
||||
pcre, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
|
||||
|
|
@ -12,11 +12,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sssd";
|
||||
version = "1.16.4";
|
||||
version = "1.16.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SSSD";
|
||||
repo = pname;
|
||||
rev = "${pname}-${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "0zbs04lkjbp7y92anmafl7gzamcnq1f147p13hc4byyvjk9rg6f7";
|
||||
};
|
||||
patches = [
|
||||
# Fix build failure against samba 4.12.0rc1
|
||||
|
|
@ -60,9 +62,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
|
||||
samba nfs-utils doxygen python python3 popt
|
||||
talloc tdb tevent pkg-config ldb pam openldap pcre libkrb5
|
||||
samba nfs-utils python python3 popt
|
||||
talloc tdb tevent ldb pam openldap pcre libkrb5
|
||||
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
|
||||
libuuid ldap systemd nspr check cmocka uid_wrapper
|
||||
nss_wrapper ncurses Po4a http-parser jansson ];
|
||||
|
|
@ -95,8 +98,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "System Security Services Daemon";
|
||||
homepage = "https://fedorahosted.org/sssd/";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://sssd.io/";
|
||||
changelog = "https://sssd.io/release-notes/sssd-${version}.html";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.e-user ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@ buildGoModule rec {
|
|||
|
||||
vendorSha256 = "1l1wydvi0yalas79cvhrqg563cvs57hg9rv6qnkw879r6smb2x1n";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dendrite;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://matrix.org";
|
||||
description = "Dendrite is a second-generation Matrix homeserver written in Go!";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,29 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "gotty";
|
||||
version = "2.0.0-alpha.3";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/yudai/gotty";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "yudai";
|
||||
owner = "sorenisanerd";
|
||||
repo = "gotty";
|
||||
sha256 = "1vhhs7d4k1vpkf2k69ai2r3bp3zwnwa8l9q7vza0rck69g4nmz7a";
|
||||
rev = "v${version}";
|
||||
sha256 = "06ngxnblwkmiln9bxikg9q2wdlh45481pnz87bpsw2r7hc69bv9n";
|
||||
};
|
||||
|
||||
vendorSha256 = "0mzf5209r3fzqf9q98j3b2cdzvfa3kg62xn0spx5zr6nabmhaa79";
|
||||
|
||||
# upstream did not update the tests, so they are broken now
|
||||
# https://github.com/sorenisanerd/gotty/issues/13
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Share your terminal as a web application";
|
||||
homepage = "https://github.com/yudai/gotty";
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/sorenisanerd/gotty";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -677,6 +677,8 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error"
|
||||
"--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_sleeping_device_error"
|
||||
"--deselect tests/components/shelly/test_config_flow.py::test_zeroconf_require_auth"
|
||||
# prometheus/test_init.py: Spurious AssertionError regarding humidifier_target_humidity_percent metric
|
||||
"--deselect tests/components/prometheus/test_init.py::test_view"
|
||||
# tests are located in tests/
|
||||
"tests"
|
||||
# dynamically add packages required for component tests
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "13.0.0";
|
||||
version = "13.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
sha256 = "sha256-jpjAPldmJkyXGsokw9MO1u0VysYBXeQ8MamEPWvBGvs=";
|
||||
sha256 = "sha256-81i8Yf9rEuHtUDqYThUCn0/Lb9YokRi4tGi/Ooyyxr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue