Merge master into staging-next
This commit is contained in:
commit
79cb2f7e61
|
@ -2,14 +2,11 @@
|
||||||
|
|
||||||
Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software.
|
Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software.
|
||||||
This section assumes some knowledge of the latter.
|
This section assumes some knowledge of the latter.
|
||||||
There are two problems that the Nixpkgs Qt infrastructure addresses,
|
|
||||||
which are not shared by other C++ software:
|
|
||||||
|
|
||||||
1. There are usually multiple supported versions of Qt in Nixpkgs.
|
The major caveat with Qt applications is that Qt uses a plugin system to load additional modules at runtime,
|
||||||
All of a package's dependencies must be built with the same version of Qt.
|
from a list of well-known locations. In Nixpkgs, we patch QtCore to instead use an environment variable,
|
||||||
This is similar to the version constraints imposed on interpreted languages like Python.
|
and wrap Qt applications to set it to the right paths. This effectively makes the runtime dependencies
|
||||||
2. Qt makes extensive use of runtime dependency detection.
|
pure and explicit at build-time, at the cost of introducing an extra indirection.
|
||||||
Runtime dependencies are made into build dependencies through wrappers.
|
|
||||||
|
|
||||||
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
|
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
|
||||||
|
|
||||||
|
@ -95,66 +92,3 @@ stdenv.mkDerivation {
|
||||||
This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned.
|
This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned.
|
||||||
An example of when you'd always need to do this is with Python applications that use PyQt.
|
An example of when you'd always need to do this is with Python applications that use PyQt.
|
||||||
:::
|
:::
|
||||||
|
|
||||||
## Adding a library to Nixpkgs {#adding-a-library-to-nixpkgs}
|
|
||||||
|
|
||||||
Add Qt libraries to `qt5-packages.nix` to make them available for every
|
|
||||||
supported Qt version.
|
|
||||||
|
|
||||||
### Example adding a Qt library {#qt-library-all-packages-nix}
|
|
||||||
|
|
||||||
The following represents the contents of `qt5-packages.nix`.
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{
|
|
||||||
# ...
|
|
||||||
|
|
||||||
mylib = callPackage ../path/to/mylib {};
|
|
||||||
|
|
||||||
# ...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Libraries are built with every available version of Qt.
|
|
||||||
Use the `meta.broken` attribute to disable the package for unsupported Qt versions:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{ stdenv, lib, qtbase }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
# ...
|
|
||||||
# Disable this library with Qt < 5.9.0
|
|
||||||
meta.broken = lib.versionOlder qtbase.version "5.9.0";
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Adding an application to Nixpkgs {#adding-an-application-to-nixpkgs}
|
|
||||||
|
|
||||||
Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix`
|
|
||||||
to select the Qt 5 version used for the application.
|
|
||||||
|
|
||||||
### Example adding a Qt application {#qt-application-all-packages-nix}
|
|
||||||
|
|
||||||
The following represents the contents of `qt5-packages.nix`.
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{
|
|
||||||
# ...
|
|
||||||
|
|
||||||
myapp = callPackage ../path/to/myapp {};
|
|
||||||
|
|
||||||
# ...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
The following represents the contents of `all-packages.nix`.
|
|
||||||
|
|
||||||
```nix
|
|
||||||
{
|
|
||||||
# ...
|
|
||||||
|
|
||||||
myapp = libsForQt5.myapp;
|
|
||||||
|
|
||||||
# ...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.nginx;
|
cfg = config.services.nginx;
|
||||||
certs = config.security.acme.certs;
|
inherit (config.security.acme) certs;
|
||||||
vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
|
vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
|
||||||
acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null) vhostsConfigs;
|
acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null) vhostsConfigs;
|
||||||
dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts);
|
dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts);
|
||||||
|
@ -27,7 +27,7 @@ let
|
||||||
else "${certs.${certName}.directory}/chain.pem";
|
else "${certs.${certName}.directory}/chain.pem";
|
||||||
})
|
})
|
||||||
) cfg.virtualHosts;
|
) cfg.virtualHosts;
|
||||||
enableIPv6 = config.networking.enableIPv6;
|
inherit (config.networking) enableIPv6;
|
||||||
|
|
||||||
# Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli
|
# Mime.types values are taken from brotli sample configuration - https://github.com/google/ngx_brotli
|
||||||
# and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx
|
# and Nginx Server Configs - https://github.com/h5bp/server-configs-nginx
|
||||||
|
@ -149,7 +149,7 @@ let
|
||||||
''}
|
''}
|
||||||
${upstreamConfig}
|
${upstreamConfig}
|
||||||
|
|
||||||
${optionalString (cfg.recommendedOptimisation) ''
|
${optionalString cfg.recommendedOptimisation ''
|
||||||
# optimisation
|
# optimisation
|
||||||
sendfile on;
|
sendfile on;
|
||||||
tcp_nopush on;
|
tcp_nopush on;
|
||||||
|
@ -161,7 +161,7 @@ let
|
||||||
${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"}
|
${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"}
|
||||||
${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"}
|
${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"}
|
||||||
|
|
||||||
${optionalString (cfg.recommendedTlsSettings) ''
|
${optionalString cfg.recommendedTlsSettings ''
|
||||||
# Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
|
# Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
|
||||||
|
|
||||||
ssl_session_timeout 1d;
|
ssl_session_timeout 1d;
|
||||||
|
@ -177,7 +177,7 @@ let
|
||||||
ssl_stapling_verify on;
|
ssl_stapling_verify on;
|
||||||
''}
|
''}
|
||||||
|
|
||||||
${optionalString (cfg.recommendedBrotliSettings) ''
|
${optionalString cfg.recommendedBrotliSettings ''
|
||||||
brotli on;
|
brotli on;
|
||||||
brotli_static on;
|
brotli_static on;
|
||||||
brotli_comp_level 5;
|
brotli_comp_level 5;
|
||||||
|
@ -187,7 +187,7 @@ let
|
||||||
brotli_buffers 32 8k;
|
brotli_buffers 32 8k;
|
||||||
''}
|
''}
|
||||||
|
|
||||||
${optionalString (cfg.recommendedGzipSettings) ''
|
${optionalString cfg.recommendedGzipSettings ''
|
||||||
gzip on;
|
gzip on;
|
||||||
gzip_proxied any;
|
gzip_proxied any;
|
||||||
gzip_comp_level 5;
|
gzip_comp_level 5;
|
||||||
|
@ -205,7 +205,7 @@ let
|
||||||
gzip_vary on;
|
gzip_vary on;
|
||||||
''}
|
''}
|
||||||
|
|
||||||
${optionalString (cfg.recommendedProxySettings) ''
|
${optionalString cfg.recommendedProxySettings ''
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
proxy_connect_timeout ${cfg.proxyTimeout};
|
proxy_connect_timeout ${cfg.proxyTimeout};
|
||||||
proxy_send_timeout ${cfg.proxyTimeout};
|
proxy_send_timeout ${cfg.proxyTimeout};
|
||||||
|
@ -239,7 +239,7 @@ let
|
||||||
|
|
||||||
server_tokens ${if cfg.serverTokens then "on" else "off"};
|
server_tokens ${if cfg.serverTokens then "on" else "off"};
|
||||||
|
|
||||||
${optionalString (cfg.proxyCache.enable) ''
|
${optionalString cfg.proxyCache.enable ''
|
||||||
proxy_cache_path /var/cache/nginx keys_zone=${cfg.proxyCache.keysZoneName}:${cfg.proxyCache.keysZoneSize}
|
proxy_cache_path /var/cache/nginx keys_zone=${cfg.proxyCache.keysZoneName}:${cfg.proxyCache.keysZoneSize}
|
||||||
levels=${cfg.proxyCache.levels}
|
levels=${cfg.proxyCache.levels}
|
||||||
use_temp_path=${if cfg.proxyCache.useTempPath then "on" else "off"}
|
use_temp_path=${if cfg.proxyCache.useTempPath then "on" else "off"}
|
||||||
|
@ -993,8 +993,6 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
# TODO: test user supplied config file pases syntax test
|
|
||||||
|
|
||||||
warnings =
|
warnings =
|
||||||
let
|
let
|
||||||
deprecatedSSL = name: config: optional config.enableSSL
|
deprecatedSSL = name: config: optional config.enableSSL
|
||||||
|
@ -1142,14 +1140,14 @@ in
|
||||||
sslServices = map (certName: "acme-${certName}.service") dependentCertNames;
|
sslServices = map (certName: "acme-${certName}.service") dependentCertNames;
|
||||||
sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames;
|
sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames;
|
||||||
in mkIf (cfg.enableReload || sslServices != []) {
|
in mkIf (cfg.enableReload || sslServices != []) {
|
||||||
wants = optionals (cfg.enableReload) [ "nginx.service" ];
|
wants = optionals cfg.enableReload [ "nginx.service" ];
|
||||||
wantedBy = sslServices ++ [ "multi-user.target" ];
|
wantedBy = sslServices ++ [ "multi-user.target" ];
|
||||||
# Before the finished targets, after the renew services.
|
# Before the finished targets, after the renew services.
|
||||||
# This service might be needed for HTTP-01 challenges, but we only want to confirm
|
# This service might be needed for HTTP-01 challenges, but we only want to confirm
|
||||||
# certs are updated _after_ config has been reloaded.
|
# certs are updated _after_ config has been reloaded.
|
||||||
before = sslTargets;
|
before = sslTargets;
|
||||||
after = sslServices;
|
after = sslServices;
|
||||||
restartTriggers = optionals (cfg.enableReload) [ finalConfigFile ];
|
restartTriggers = optionals cfg.enableReload [ finalConfigFile ];
|
||||||
# Block reloading if not all certs exist yet.
|
# Block reloading if not all certs exist yet.
|
||||||
# Happens when config changes add new vhosts/certs.
|
# Happens when config changes add new vhosts/certs.
|
||||||
unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames);
|
unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames);
|
||||||
|
|
|
@ -15,11 +15,11 @@ let
|
||||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||||
|
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "0xbwx218dzf9nyjf531sb9ij0p8lz08yi09yz8dms07qcsfirac0";
|
x86_64-linux = "0mm6xa0kizgg2f6cql6jk8h83pn89h6q7rrs1kypvj3j0x6ysqsg";
|
||||||
x86_64-darwin = "028i7cbh43ivz5amx015v0d87kh4jj54b3ndirxl57py2gxszy0x";
|
x86_64-darwin = "1g9syvinj2mx292wrnrdn2znqhg17mrjqij0z1ilag5bi4xmzhcj";
|
||||||
aarch64-linux = "1rg67sfp3abpcxrl89db6x3a41la63xinl4kjin8v08w5iprrm0n";
|
aarch64-linux = "0xbq6fla0lxan08jgmsva91cbcv8rhzd7mqixrm1lsqh4h0wpssz";
|
||||||
aarch64-darwin = "0zm057rvabd29ay88l0h40adrc71p9cjvml34aci58klaqd2if0q";
|
aarch64-darwin = "1b4a56j256rib1997g9wwiak206axkppl124qg021vyab42x8rim";
|
||||||
armv7l-linux = "0amxgq98gifcjr9wfx8ddcjqkb1b6pr5q3dwfdbyynksqqd4hrxv";
|
armv7l-linux = "0gb96hi854kyh8694j9mbgl78f4y68czkwmjxhzb054l5b4adjla";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
|
|
||||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||||
|
@ -29,7 +29,7 @@ in
|
||||||
|
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.74.2.22355";
|
version = "1.74.3.23010";
|
||||||
pname = "vscodium";
|
pname = "vscodium";
|
||||||
|
|
||||||
executableName = "codium";
|
executableName = "codium";
|
||||||
|
|
|
@ -9,10 +9,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# Keep these separate so the update script can regex them
|
# Keep these separate so the update script can regex them
|
||||||
rpcs3GitVersion = "14358-a00f9e421";
|
rpcs3GitVersion = "14568-1852b370d";
|
||||||
rpcs3Version = "0.0.25-14358-a00f9e421";
|
rpcs3Version = "0.0.26-14568-1852b370d";
|
||||||
rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef";
|
rpcs3Revision = "1852b370d7a8310de092ca4132464c84192671cb";
|
||||||
rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv";
|
rpcs3Sha256 = "0yqvn5w9b4lxb43lllqch0s1sdj5v274hhbysgblbc7nilzcgsq6";
|
||||||
|
|
||||||
ittapi = fetchFromGitHub {
|
ittapi = fetchFromGitHub {
|
||||||
owner = "intel";
|
owner = "intel";
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fetchmail";
|
pname = "fetchmail";
|
||||||
version = "6.4.34";
|
version = "6.4.35";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||||
sha256 = "sha256-w73e0bXOI2lgvRzu7j8yVyIO2Zw+7ISl12u1YY4yWNQ=";
|
sha256 = "sha256-ewtWy8D8qFRQTxZ3lfq1MtWlTVp9O24+NqM/NKCWCgE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl python3 ];
|
buildInputs = [ openssl python3 ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "argocd-autopilot";
|
pname = "argocd-autopilot";
|
||||||
version = "0.4.9";
|
version = "0.4.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "argoproj-labs";
|
owner = "argoproj-labs";
|
||||||
repo = "argocd-autopilot";
|
repo = "argocd-autopilot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-PHs6shuj2wHvlP6n05RPJjMY6wtJ1PbD6t0DxYrJpXE=";
|
sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0=";
|
vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0=";
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "argocd";
|
pname = "argocd";
|
||||||
version = "2.5.5";
|
version = "2.5.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "argoproj";
|
owner = "argoproj";
|
||||||
repo = "argo-cd";
|
repo = "argo-cd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-u9VOkUaKQAdlXhCUUONBws4rW6PvxFSNXbit7gi6/P0=";
|
sha256 = "sha256-R00HW4jh6zohMoli9aomPCK/svzWSUi9fcRFvevMhyU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
proxyVendor = true; # darwin/linux hash mismatch
|
proxyVendor = true; # darwin/linux hash mismatch
|
||||||
vendorSha256 = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw=";
|
vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw=";
|
||||||
|
|
||||||
# Set target as ./cmd per cli-local
|
# Set target as ./cmd per cli-local
|
||||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
, nodejs
|
, nodejs
|
||||||
, fetchYarnDeps
|
, fetchYarnDeps
|
||||||
, electron
|
, electron
|
||||||
|
, libpulseaudio
|
||||||
|
, pipewire
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -66,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||||
popd
|
popd
|
||||||
|
|
||||||
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
|
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
|
||||||
--add-flags "$out/share/teams-for-linux/app.asar" \
|
--add-flags "$out/share/teams-for-linux/app.asar" \
|
||||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "media-downloader";
|
pname = "media-downloader";
|
||||||
version = "2.7.0";
|
version = "2.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mhogomchungu";
|
owner = "mhogomchungu";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
sha256 = "sha256-uu/4S7cVWHOhBq52NF0AargE0nbPwjF0txSWL0DquQo=";
|
sha256 = "sha256-RMZG+rPbwJFL2AzEZlTrc8/bQCx8CWCWppEBjCj5hnU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];
|
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "httplib";
|
pname = "httplib";
|
||||||
version = "0.11.3";
|
version = "0.11.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "yhirose";
|
owner = "yhirose";
|
||||||
repo = "cpp-httplib";
|
repo = "cpp-httplib";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-gly0AQ2DCZJQCAPQL5Xsc/kTvFK2twIDbHwbjvrW+P4=";
|
hash = "sha256-RTC2Q8T5tvi27BuZuH++wmKZ3bvIHL09S4F8YeO5Fbg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Header-only library.
|
# Header-only library.
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds
|
{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds
|
||||||
, openssl, openldap, libedit, keyutils
|
, openssl, openldap, libedit, keyutils
|
||||||
|
|
||||||
|
# for passthru.tests
|
||||||
|
, bind
|
||||||
|
, curl
|
||||||
, nixosTests
|
, nixosTests
|
||||||
|
, openssh
|
||||||
|
, postgresql
|
||||||
|
, python3
|
||||||
|
|
||||||
# Extra Arguments
|
# Extra Arguments
|
||||||
, type ? ""
|
, type ? ""
|
||||||
|
@ -92,6 +99,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
implementation = "krb5";
|
implementation = "krb5";
|
||||||
tests = { inherit (nixosTests) kerberos; };
|
tests = {
|
||||||
|
inherit (nixosTests) kerberos;
|
||||||
|
inherit (python3.pkgs) requests-credssp;
|
||||||
|
bind = bind.override { enableGSSAPI = true; };
|
||||||
|
curl = curl.override { gssSupport = true; };
|
||||||
|
openssh = openssh.override { withKerberos = true; };
|
||||||
|
postgresql = postgresql.override { gssSupport = true; };
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-appengine-logging";
|
pname = "google-cloud-appengine-logging";
|
||||||
version = "1.2.0";
|
version = "1.3.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-pvao522dfnRx6JJe4osRgU+q1LpBvdOTP4W9UVVZNiY=";
|
hash = "sha256-1S8U4empk3l6CG7/PUdy3qeQg5DGrWEtJigTQfF8mkk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-bigquery-logging";
|
pname = "google-cloud-bigquery-logging";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-TGK5ghwhVBN0VBMj84Jjt4gpsXQC+HKAr5yP756PbDM=";
|
hash = "sha256-OsQeBJMvq/NOC6T7N4jyrsKzcazOAn838CDjfDq7dZA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-iam-logging";
|
pname = "google-cloud-iam-logging";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-q+R8l14wD0PNxP1xKwZcXlbyln3uwoscAsOvletuetg=";
|
hash = "sha256-Xj7XJ/Wz9dmbqygKqjcvWn+zeGejYyqBzLkpNufX8lQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "meross-iot";
|
pname = "meross-iot";
|
||||||
version = "0.4.5.7";
|
version = "0.4.5.9";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "albertogeniola";
|
owner = "albertogeniola";
|
||||||
repo = "MerossIot";
|
repo = "MerossIot";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-nheTAMXX0IZE1XH2+o9ML1Qt9zMw7oTZi4Cba+LdG4s=";
|
hash = "sha256-Wyg9Y4THnjNTWQsiOanoyEEBqVgsG5MeyoGE69/n8sM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "twilio";
|
pname = "twilio";
|
||||||
version = "7.16.0";
|
version = "7.16.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "twilio";
|
owner = "twilio";
|
||||||
repo = "twilio-python";
|
repo = "twilio-python";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-+cbcINDnPmgNtZeQUOuTwU24Fe0i3xisxTYurV4GW7Y=";
|
hash = "sha256-n4n6lG3lzfGh5HPjt1oNWGjSTobHP7IJach2xLdBNdY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -10,16 +10,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-release";
|
pname = "cargo-release";
|
||||||
version = "0.24.3";
|
version = "0.24.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "crate-ci";
|
owner = "crate-ci";
|
||||||
repo = "cargo-release";
|
repo = "cargo-release";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-ggB6gDlIuHPgJJg9TsHXHOKAm7+6OjXzoAT74YUB1n8=";
|
hash = "sha256-6vl8aVZc1pLRXNWbwCWOg/W40TXe29CtXZy2uOLc5BQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-gBVcQzuJNDwdC59gaOYqvaJDP46wJ9CglYbSPt3zkZ8=";
|
cargoHash = "sha256-xz6xjYHBltMo2abQxVTA9mAI4htqqxUc5s5ksKbmrno=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
{ buildFHSUserEnv, callPackage, lib, openssl }:
|
{ buildFHSUserEnv, callPackage, lib }:
|
||||||
let
|
let
|
||||||
|
|
||||||
shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix {
|
shticker-book-unwritten-unwrapped = callPackage ./unwrapped.nix { };
|
||||||
inherit openssl;
|
|
||||||
};
|
|
||||||
|
|
||||||
in buildFHSUserEnv {
|
in buildFHSUserEnv {
|
||||||
name = "shticker_book_unwritten";
|
name = "shticker_book_unwritten";
|
||||||
|
|
|
@ -10,16 +10,16 @@ let
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ntfy-sh";
|
pname = "ntfy-sh";
|
||||||
version = "1.29.1";
|
version = "1.30.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "binwiederhier";
|
owner = "binwiederhier";
|
||||||
repo = "ntfy";
|
repo = "ntfy";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ikXhST+fvXu7FBeoYMzPq2LhpAw3gfaES1WlhnRO8BY=";
|
sha256 = "sha256-MgjCfYYv4tBZHsoj9oXGKYOQb0Anp0zVD/vc+UpAiAc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-VVqaQFluqV77/+Asu9xSBpCvoYr276UE3Yg+iNkxP0o=";
|
vendorSha256 = "sha256-8TQVpJ02EPve1OUP6RHbvwBug8larSO3BgBiCfL2614=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
1060
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
1060
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
|
@ -22552,6 +22552,7 @@ with pkgs;
|
||||||
});
|
});
|
||||||
|
|
||||||
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1
|
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1
|
||||||
|
# Current users: mumble, murmur
|
||||||
qt5_openssl_1_1 = qt5.overrideScope' (_: super: {
|
qt5_openssl_1_1 = qt5.overrideScope' (_: super: {
|
||||||
qtbase = super.qtbase.override {
|
qtbase = super.qtbase.override {
|
||||||
openssl = openssl_1_1;
|
openssl = openssl_1_1;
|
||||||
|
@ -22561,10 +22562,6 @@ with pkgs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
libsForQt5_openssl_1_1 = import ./qt5-packages.nix {
|
|
||||||
inherit lib pkgs;
|
|
||||||
qt5 = qt5_openssl_1_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
|
||||||
plasma5Packages = libsForQt5;
|
plasma5Packages = libsForQt5;
|
||||||
|
@ -32753,7 +32750,9 @@ with pkgs;
|
||||||
|
|
||||||
teams = callPackage ../applications/networking/instant-messengers/teams { };
|
teams = callPackage ../applications/networking/instant-messengers/teams { };
|
||||||
|
|
||||||
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { };
|
teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {
|
||||||
|
electron = electron_21;
|
||||||
|
};
|
||||||
|
|
||||||
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
|
teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
|
||||||
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
|
teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
|
||||||
|
@ -35204,9 +35203,7 @@ with pkgs;
|
||||||
|
|
||||||
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
|
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
|
||||||
|
|
||||||
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten {
|
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
|
||||||
openssl = openssl_1_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
sienna = callPackage ../games/sienna { };
|
sienna = callPackage ../games/sienna { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user