mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
557d2b4d68
75 changed files with 481 additions and 322 deletions
|
|
@ -334,6 +334,13 @@
|
|||
<section xml:id="sec-release-21.11-incompatibilities">
|
||||
<title>Backward Incompatibilities</title>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.wakeonlan</literal> option was removed,
|
||||
and replaced with
|
||||
<literal>networking.interfaces.<name>.wakeOnLan</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>security.wrappers</literal> option now requires
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
|
||||
|
||||
- The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`.
|
||||
|
||||
- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.
|
||||
This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe.
|
||||
|
||||
|
|
|
|||
|
|
@ -883,7 +883,6 @@
|
|||
./services/video/unifi-video.nix
|
||||
./services/networking/v2ray.nix
|
||||
./services/networking/vsftpd.nix
|
||||
./services/networking/wakeonlan.nix
|
||||
./services/networking/wasabibackend.nix
|
||||
./services/networking/websockify.nix
|
||||
./services/networking/wg-quick.nix
|
||||
|
|
|
|||
|
|
@ -122,6 +122,14 @@ in {
|
|||
options = {
|
||||
services.matrix-synapse = {
|
||||
enable = mkEnableOption "matrix.org synapse";
|
||||
configFile = mkOption {
|
||||
type = types.str;
|
||||
readOnly = true;
|
||||
description = ''
|
||||
Path to the configuration file on the target system. Useful to configure e.g. workers
|
||||
that also need this.
|
||||
'';
|
||||
};
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.matrix-synapse;
|
||||
|
|
@ -706,6 +714,8 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
services.matrix-synapse.configFile = "${configFile}";
|
||||
|
||||
users.users.matrix-synapse = {
|
||||
group = "matrix-synapse";
|
||||
home = cfg.dataDir;
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
interfaces = config.services.wakeonlan.interfaces;
|
||||
|
||||
ethtool = "${pkgs.ethtool}/sbin/ethtool";
|
||||
|
||||
passwordParameter = password : if (password == "") then "" else
|
||||
"sopass ${password}";
|
||||
|
||||
methodParameter = {method, password} :
|
||||
if method == "magicpacket" then "wol g"
|
||||
else if method == "password" then "wol s so ${passwordParameter password}"
|
||||
else throw "Wake-On-Lan method not supported";
|
||||
|
||||
line = { interface, method ? "magicpacket", password ? "" }: ''
|
||||
${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
|
||||
'';
|
||||
|
||||
concatStrings = foldr (x: y: x + y) "";
|
||||
lines = concatStrings (map (l: line l) interfaces);
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.wakeonlan.interfaces = mkOption {
|
||||
default = [ ];
|
||||
type = types.listOf (types.submodule { options = {
|
||||
interface = mkOption {
|
||||
type = types.str;
|
||||
description = "Interface to enable for Wake-On-Lan.";
|
||||
};
|
||||
method = mkOption {
|
||||
type = types.enum [ "magicpacket" "password"];
|
||||
description = "Wake-On-Lan method for this interface.";
|
||||
};
|
||||
password = mkOption {
|
||||
type = types.strMatching "[a-fA-F0-9]{2}:([a-fA-F0-9]{2}:){4}[a-fA-F0-9]{2}";
|
||||
description = "The password has the shape of six bytes in hexadecimal separated by a colon each.";
|
||||
};
|
||||
};});
|
||||
example = [
|
||||
{
|
||||
interface = "eth0";
|
||||
method = "password";
|
||||
password = "00:11:22:33:44:55";
|
||||
}
|
||||
];
|
||||
description = ''
|
||||
Interfaces where to enable Wake-On-LAN, and how. Two methods available:
|
||||
"magicpacket" and "password". The password has the shape of six bytes
|
||||
in hexadecimal separated by a colon each. For more information,
|
||||
check the ethtool manual.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config.powerManagement.powerUpCommands = lines;
|
||||
|
||||
}
|
||||
|
|
@ -51,6 +51,12 @@ let
|
|||
in {
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "nextcloud" "config" "adminpass" ] ''
|
||||
Please use `services.nextcloud.config.adminpassFile' instead!
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "nextcloud" "config" "dbpass" ] ''
|
||||
Please use `services.nextcloud.config.dbpassFile' instead!
|
||||
'')
|
||||
(mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] ''
|
||||
The nextcloud module supports `nginx` as reverse-proxy by default and doesn't
|
||||
support other reverse-proxies officially.
|
||||
|
|
@ -206,14 +212,6 @@ in {
|
|||
default = "nextcloud";
|
||||
description = "Database user.";
|
||||
};
|
||||
dbpass = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Database password. Use <literal>dbpassFile</literal> to avoid this
|
||||
being world-readable in the <literal>/nix/store</literal>.
|
||||
'';
|
||||
};
|
||||
dbpassFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
|
@ -246,17 +244,8 @@ in {
|
|||
default = "root";
|
||||
description = "Admin username.";
|
||||
};
|
||||
adminpass = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Admin password. Use <literal>adminpassFile</literal> to avoid this
|
||||
being world-readable in the <literal>/nix/store</literal>.
|
||||
'';
|
||||
};
|
||||
adminpassFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
type = types.str;
|
||||
description = ''
|
||||
The full path to a file that contains the admin's password. Must be
|
||||
readable by user <literal>nextcloud</literal>.
|
||||
|
|
@ -321,8 +310,8 @@ in {
|
|||
This mounts a bucket on an Amazon S3 object storage or compatible
|
||||
implementation into the virtual filesystem.
|
||||
|
||||
See nextcloud's documentation on "Object Storage as Primary
|
||||
Storage" for more details.
|
||||
Further details about this feature can be found in the
|
||||
<link xlink:href="https://docs.nextcloud.com/server/22/admin_manual/configuration_files/primary_storage.html">upstream documentation</link>.
|
||||
'';
|
||||
bucket = mkOption {
|
||||
type = types.str;
|
||||
|
|
@ -389,9 +378,9 @@ in {
|
|||
Required for some non-Amazon S3 implementations.
|
||||
|
||||
Ordinarily, requests will be made with
|
||||
http://bucket.hostname.domain/, but with path style
|
||||
<literal>http://bucket.hostname.domain/</literal>, but with path style
|
||||
enabled requests are made with
|
||||
http://hostname.domain/bucket instead.
|
||||
<literal>http://hostname.domain/bucket</literal> instead.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -399,11 +388,11 @@ in {
|
|||
};
|
||||
|
||||
enableImagemagick = mkEnableOption ''
|
||||
Whether to load the ImageMagick module into PHP.
|
||||
the ImageMagick module for PHP.
|
||||
This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF).
|
||||
You may want to disable it for increased security. In that case, previews will still be available
|
||||
for some images (e.g. JPEG and PNG).
|
||||
See https://github.com/nextcloud/server/issues/13099
|
||||
See <link xlink:href="https://github.com/nextcloud/server/issues/13099" />.
|
||||
'' // {
|
||||
default = true;
|
||||
};
|
||||
|
|
@ -464,13 +453,6 @@ in {
|
|||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{ assertions = let acfg = cfg.config; in [
|
||||
{ assertion = !(acfg.dbpass != null && acfg.dbpassFile != null);
|
||||
message = "Please specify no more than one of dbpass or dbpassFile";
|
||||
}
|
||||
{ assertion = ((acfg.adminpass != null || acfg.adminpassFile != null)
|
||||
&& !(acfg.adminpass != null && acfg.adminpassFile != null));
|
||||
message = "Please specify exactly one of adminpass or adminpassFile";
|
||||
}
|
||||
{ assertion = versionOlder cfg.package.version "21" -> cfg.config.defaultPhoneRegion == null;
|
||||
message = "The `defaultPhoneRegion'-setting is only supported for Nextcloud >=21!";
|
||||
}
|
||||
|
|
@ -613,7 +595,6 @@ in {
|
|||
${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"}
|
||||
${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"}
|
||||
${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"}
|
||||
${optionalString (c.dbpass != null) "'dbpassword' => '${c.dbpass}',"}
|
||||
${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"}
|
||||
'dbtype' => '${c.dbtype}',
|
||||
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
|
||||
|
|
@ -623,14 +604,17 @@ in {
|
|||
];
|
||||
'';
|
||||
occInstallCmd = let
|
||||
dbpass = if c.dbpassFile != null
|
||||
then ''"$(<"${toString c.dbpassFile}")"''
|
||||
else if c.dbpass != null
|
||||
then ''"${toString c.dbpass}"''
|
||||
else ''""'';
|
||||
adminpass = if c.adminpassFile != null
|
||||
then ''"$(<"${toString c.adminpassFile}")"''
|
||||
else ''"${toString c.adminpass}"'';
|
||||
mkExport = { arg, value }: "export ${arg}=${value}";
|
||||
dbpass = {
|
||||
arg = "DBPASS";
|
||||
value = if c.dbpassFile != null
|
||||
then ''"$(<"${toString c.dbpassFile}")"''
|
||||
else ''""'';
|
||||
};
|
||||
adminpass = {
|
||||
arg = "ADMINPASS";
|
||||
value = ''"$(<"${toString c.adminpassFile}")"'';
|
||||
};
|
||||
installFlags = concatStringsSep " \\\n "
|
||||
(mapAttrsToList (k: v: "${k} ${toString v}") {
|
||||
"--database" = ''"${c.dbtype}"'';
|
||||
|
|
@ -641,12 +625,14 @@ in {
|
|||
${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
|
||||
${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
|
||||
${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
|
||||
"--database-pass" = dbpass;
|
||||
"--database-pass" = "\$${dbpass.arg}";
|
||||
"--admin-user" = ''"${c.adminuser}"'';
|
||||
"--admin-pass" = adminpass;
|
||||
"--admin-pass" = "\$${adminpass.arg}";
|
||||
"--data-dir" = ''"${cfg.home}/data"'';
|
||||
});
|
||||
in ''
|
||||
${mkExport dbpass}
|
||||
${mkExport adminpass}
|
||||
${occ}/bin/nextcloud-occ maintenance:install \
|
||||
${installFlags}
|
||||
'';
|
||||
|
|
@ -673,16 +659,14 @@ in {
|
|||
exit 1
|
||||
fi
|
||||
''}
|
||||
${optionalString (c.adminpassFile != null) ''
|
||||
if [ ! -r "${c.adminpassFile}" ]; then
|
||||
echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..."
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$(<${c.adminpassFile})" ]; then
|
||||
echo "adminpassFile ${c.adminpassFile} is empty!"
|
||||
exit 1
|
||||
fi
|
||||
''}
|
||||
if [ ! -r "${c.adminpassFile}" ]; then
|
||||
echo "adminpassFile ${c.adminpassFile} is not readable by nextcloud:nextcloud! Aborting..."
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$(<${c.adminpassFile})" ]; then
|
||||
echo "adminpassFile ${c.adminpassFile} is empty!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ln -sf ${cfg.package}/apps ${cfg.home}/
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ let
|
|||
MACAddress = i.macAddress;
|
||||
} // optionalAttrs (i.mtu != null) {
|
||||
MTUBytes = toString i.mtu;
|
||||
} // optionalAttrs (i.wakeOnLan.enable == true) {
|
||||
WakeOnLan = "magic";
|
||||
};
|
||||
};
|
||||
in listToAttrs (map createNetworkLink interfaces);
|
||||
|
|
|
|||
|
|
@ -284,6 +284,13 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
wakeOnLan = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Wether to enable wol on this interface.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ in {
|
|||
hostName = "nextcloud";
|
||||
config = {
|
||||
# Don't inherit adminuser since "root" is supposed to be the default
|
||||
inherit adminpass;
|
||||
adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home!
|
||||
dbtableprefix = "nixos_";
|
||||
};
|
||||
package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ in {
|
|||
dbuser = "nextcloud";
|
||||
dbhost = "127.0.0.1";
|
||||
dbport = 3306;
|
||||
dbpass = "hunter2";
|
||||
dbpassFile = "${pkgs.writeText "dbpass" "hunter2" }";
|
||||
# Don't inherit adminuser since "root" is supposed to be the default
|
||||
inherit adminpass;
|
||||
adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home!
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
, lrdf
|
||||
, lv2
|
||||
, pkg-config
|
||||
, python2
|
||||
, python3
|
||||
, sassc
|
||||
, serd
|
||||
, sord
|
||||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
hicolor-icon-theme
|
||||
intltool
|
||||
pkg-config
|
||||
python2
|
||||
python3
|
||||
wafHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ==";
|
||||
sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "11zj9b8zhgfyh3m78ihg1k78m3v1khwa742mmsxji6ryxqkhvnr4";
|
||||
x86_64-darwin = "19jk8rry11dvyfprq8i2j9r9aj17kfxqx5hl069mlkz0ca18kxmc";
|
||||
aarch64-linux = "01slccwqhh6njd8q278svbfxph5lajx77ns03yrj9iva8w48gixy";
|
||||
armv7l-linux = "1g7zq6y99b5sg8g10hq50qr15m99n0cmydm6rl9dkyca2038ihbi";
|
||||
x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7";
|
||||
x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7";
|
||||
aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00";
|
||||
armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.60.2";
|
||||
version = "1.61.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fetchmail";
|
||||
version = "6.4.21";
|
||||
version = "6.4.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
sha256 = "sha256-akWcHK/XodqlzRNxQNpgwYyEtWmc2OckmnnDM0LJnR0=";
|
||||
sha256 = "sha256-zGgYvVlDVgIWn6KS1tFj1Wshx/UxEoKUcKOs6r5hLIQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2021.03";
|
||||
version = "2021.09";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-XdCyx+SdcV1QitDVkOl9EZCHpU8Qiwu0qhcXkU6b+9o=";
|
||||
sha256 = "1q2mbmczx2y5ylriq4k3lbjlpw4pwfq2vvcx06ymax31fsrvix84";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hlJfgNFHEjIrvHhaAje1XQbNO6e3D/qcCmdVFhklwqs=";
|
||||
sha256 = "sha256-22jZWRnymIYN1LlGOo8abVx8DTUe9VK1xAHddLknt6A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3OTkigryWsyCytyNMyumJJtc/BwtdryvDQRan2dzqfg=";
|
||||
vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ appimageTools.wrapType2 {
|
|||
description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud.";
|
||||
homepage = "https://cozy.io";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ "Simarra" ];
|
||||
maintainers = with maintainers; [ simarra ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "3.1.8";
|
||||
version = "3.1.9";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -70,7 +70,7 @@ mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "129x733a5h6d5xdf3zdz5j5lz8mv6gas5jcnyhwzyk79df138whq";
|
||||
sha256 = "1nmakl9jxmw3k8gka56cyywbjwv06a5983dy6h9jhkkq950fn33s";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoPatchelfHook
|
||||
, fetchurl
|
||||
, glibc
|
||||
|
|
@ -24,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.54.2";
|
||||
version = "0.55.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "sha256-fKUKVeR0q8oylpwF4d3jnkON4vbQ80Fc9WYWStb67ek=";
|
||||
sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, wrapGAppsHook
|
||||
, wrapQtAppsHook
|
||||
|
|
@ -34,6 +33,8 @@
|
|||
, unixODBC
|
||||
, xorg
|
||||
, zlib
|
||||
, steam
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Office suite, formerly Kingsoft Office";
|
||||
|
|
@ -107,6 +108,7 @@ stdenv.mkDerivation rec {
|
|||
sqlite
|
||||
unixODBC
|
||||
zlib
|
||||
cups.lib
|
||||
];
|
||||
|
||||
dontPatchELF = true;
|
||||
|
|
@ -137,7 +139,12 @@ stdenv.mkDerivation rec {
|
|||
"tcmalloc" # gperftools
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
installPhase = let
|
||||
steam-run = (steam.override {
|
||||
extraPkgs = p: buildInputs;
|
||||
nativeOnly = true;
|
||||
}).run;
|
||||
in ''
|
||||
prefix=$out/opt/kingsoft/wps-office
|
||||
mkdir -p $out
|
||||
cp -r opt $out
|
||||
|
|
@ -153,11 +160,14 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace $i \
|
||||
--replace /usr/bin $out/bin
|
||||
done
|
||||
'';
|
||||
|
||||
runtimeLibPath = lib.makeLibraryPath [
|
||||
cups.lib
|
||||
];
|
||||
for i in wps wpp et wpspdf; do
|
||||
mv $out/bin/$i $out/bin/.$i-orig
|
||||
makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \
|
||||
--add-flags $out/bin/.$i-orig \
|
||||
--argv0 $i
|
||||
done
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
dontWrapGApps = true;
|
||||
|
|
@ -166,8 +176,7 @@ stdenv.mkDerivation rec {
|
|||
echo "Wrapping $f"
|
||||
wrapProgram "$f" \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
"''${qtWrapperArgs[@]}" \
|
||||
--suffix LD_LIBRARY_PATH : "$runtimeLibPath"
|
||||
"''${qtWrapperArgs[@]}"
|
||||
done
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
|
||||
, fetchpatch
|
||||
, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:
|
||||
|
||||
let
|
||||
|
|
@ -7,16 +8,16 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elan";
|
||||
version = "1.0.7";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "elan";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI=";
|
||||
sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU=";
|
||||
cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
@ -40,12 +41,17 @@ rustPlatform.buildRustPackage rec {
|
|||
--subst-var dynamicLinker \
|
||||
--subst-var libPath
|
||||
'')
|
||||
# fix build, will be included in 1.1.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch";
|
||||
sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
pushd $out/bin
|
||||
mv elan-init elan
|
||||
for link in lean leanpkg leanchecker leanc leanmake; do
|
||||
for link in lean leanpkg leanchecker leanc leanmake lake; do
|
||||
ln -s elan $link
|
||||
done
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "MAVProxy";
|
||||
version = "1.8.43";
|
||||
version = "1.8.44";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "685e595dc8ccf354a62b354b5ef4b1f9558c4b76b1216a093dd1cc1fae37dd27";
|
||||
sha256 = "104000a0e57ef4591bdf28addf8057339b22cbff9501ba92b9b1720d0b2b7325";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -333,6 +333,11 @@ stdenv.mkDerivation {
|
|||
# XXX: Some tests added in 2.24.0 fail.
|
||||
# Please try to re-enable on the next release.
|
||||
disable_test t7816-grep-binary-pattern
|
||||
# fail (as of 2.33.0)
|
||||
#===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty
|
||||
disable_test t6300-for-each-ref
|
||||
#===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found
|
||||
disable_test t9902-completion
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# Test fails (as of 2.17.0, musl 1.1.19)
|
||||
disable_test t3900-i18n-commit
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0=";
|
||||
sha256 = "sha256-UsaTA6bI5pr3vbvO3jFn8A8qVRi385fbiJQD09Ut/X0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.6.4";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg=";
|
||||
sha256 = "sha256-CBRBcRvMFE9Pdxac3O15z0brF/5D279/Hat0CSYGRyE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs=";
|
||||
vendorSha256 = "sha256-xlFIO33OOyLnIvbsbyHVNdyxh0vlwQOATbbZA7rsz9E=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
@ -34,7 +34,9 @@ buildGoModule rec {
|
|||
wrapProgram $out/bin/limactl \
|
||||
--prefix PATH : ${lib.makeBinPath [ qemu ]}
|
||||
installShellCompletion --cmd limactl \
|
||||
--bash <($out/bin/limactl completion bash)
|
||||
--bash <($out/bin/limactl completion bash) \
|
||||
--fish <($out/bin/limactl completion fish) \
|
||||
--zsh <($out/bin/limactl completion zsh)
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
@ -50,4 +52,3 @@ buildGoModule rec {
|
|||
maintainers = with maintainers; [ anhduy ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#! /bin/sh
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# lists all available versions listed for a package in a site (http)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#! /bin/sh -x
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# lists all available tags from a git repository
|
||||
|
||||
|
|
|
|||
|
|
@ -188,7 +188,9 @@ tempHash=$(printf '%0*d' "$hashLength" 0)
|
|||
if [[ -n "$sri" ]]; then
|
||||
# SRI hashes only support base64
|
||||
# SRI hashes need to declare the hash type as part of the hash
|
||||
tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")"
|
||||
tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \
|
||||
|| nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \
|
||||
|| die "Failed to convert hash to SRI representation!"
|
||||
fi
|
||||
|
||||
# Escape regex metacharacter that are allowed in hashes (+)
|
||||
|
|
@ -232,7 +234,9 @@ if [[ -z "$newHash" ]]; then
|
|||
|
||||
if [[ -n "$sri" ]]; then
|
||||
# nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
|
||||
newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
|
||||
newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \
|
||||
|| nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \
|
||||
|| die "Failed to convert hash to SRI representation!"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
in
|
||||
fetchzip {
|
||||
name = "3270font-${version}";
|
||||
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip";
|
||||
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_3b8f2fb.zip";
|
||||
|
||||
sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1";
|
||||
sha256 = "06n87ydn2ayfhpg8318chmnwmdk3d4mmy65fcgf8frbiv2kpqncs";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
|||
|
|
@ -36,13 +36,13 @@ buildType = if stdenv.isDarwin then
|
|||
|
||||
edk2 = buildStdenv.mkDerivation {
|
||||
pname = "edk2";
|
||||
version = "202102";
|
||||
version = "202108";
|
||||
|
||||
# submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/tianocore/edk2";
|
||||
rev = "edk2-stable${edk2.version}";
|
||||
sha256 = "1292hfbqz4wyikdf6glqdy80n9zpy54gnfngqnyv05908hww6h82";
|
||||
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
|
||||
};
|
||||
|
||||
buildInputs = [ libuuid pythonEnv ];
|
||||
|
|
|
|||
66
pkgs/development/interpreters/dzaima-apl/default.nix
Normal file
66
pkgs/development/interpreters/dzaima-apl/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, jdk
|
||||
, makeWrapper
|
||||
, buildNativeImage ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dapl" + lib.optionalString buildNativeImage "-native";
|
||||
version = "0.2.0+unstable=2021-06-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "APL";
|
||||
rev = "28b3667beb23c6472266bb2b6eb701708fa421c6";
|
||||
hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
jdk
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
patchShebangs --build ./build
|
||||
./build
|
||||
'' + lib.optionalString buildNativeImage ''
|
||||
native-image --report-unsupported-elements-at-runtime \
|
||||
-H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl
|
||||
'' + ''
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
'' + (if buildNativeImage then ''
|
||||
mv dapl $out/bin
|
||||
'' else ''
|
||||
mkdir -p $out/share/${pname}
|
||||
mv APL.jar $out/share/${pname}/
|
||||
|
||||
makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dapl" \
|
||||
--add-flags "-jar $out/share/${pname}/APL.jar"
|
||||
'') + ''
|
||||
ln -s $out/bin/dapl $out/bin/apl
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dzaima/APL";
|
||||
description = "An APL implementation in Java" + lib.optionalString buildNativeImage ", compiled as a native image";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (jdk.meta) platforms;
|
||||
};
|
||||
}
|
||||
# TODO: Processing app
|
||||
# TODO: minimalistic JDK
|
||||
|
|
@ -4,11 +4,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.17.0";
|
||||
version = "3.26.4";
|
||||
pname = "dxflib";
|
||||
src = fetchurl {
|
||||
url = "http://www.qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96";
|
||||
url = "https://qcad.org/archives/dxflib/${pname}-${version}-src.tar.gz";
|
||||
sha256 = "0pwic33mj6bp4axai5jiyn4xqf31y0xmb1i0pcf55b2h9fav8zah";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
|
|
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://qcad.org/en/90-dxflib";
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
platforms = lib.platforms.linux;
|
||||
description = "DXF file format library";
|
||||
|
|
|
|||
|
|
@ -57,7 +57,12 @@ stdenv.mkDerivation rec {
|
|||
"-DgRPC_ABSL_PROVIDER=package"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
# Needs to be compiled with -std=c++11 for clang < 11. Interestingly this is
|
||||
# only an issue with the useLLVM stdenv, not the darwin stdenv…
|
||||
# https://github.com/grpc/grpc/issues/26473#issuecomment-860885484
|
||||
(if (stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0"
|
||||
then "-DCMAKE_CXX_STANDARD=11"
|
||||
else "-DCMAKE_CXX_STANDARD=17")
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
|
||||
];
|
||||
|
|
@ -68,7 +73,12 @@ stdenv.mkDerivation rec {
|
|||
rm -vf BUILD
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# When natively compiling, grpc_cpp_plugin is executed from the build directory,
|
||||
# needing to load dynamic libraries from the build directory, so we set
|
||||
# LD_LIBRARY_PATH to enable this. When cross compiling we need to avoid this,
|
||||
# since it can cause the grpc_cpp_plugin executable from buildPackages to
|
||||
# crash if build and host architecture are compatible (e. g. pkgsLLVM).
|
||||
preBuild = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.22.5";
|
||||
version = "0.22.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-/GELV94m75jSIFR4Ua3Sr+L9iGmzRQxPMIK2yfDiX9E=";
|
||||
sha256 = "sha256-0McLH5iNiA6aIyk6OaN57JAs97R+/4M7xaUDmh+xV6c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chess";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "niklasf";
|
||||
repo = "python-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2pyABmr6q1Y2/ivtvMYqRHE2Zjlyz2QO0us0w4l2HQM=";
|
||||
sha256 = "0f2q9sif1rqjlgzkf7dnxrclmw8v84hzyrnq21g8k1cwqj5fx9j2";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "chess" ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "colorlog";
|
||||
version = "6.4.1";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8";
|
||||
sha256 = "cf62a8e389d5660d0d22be17937b25b9abef9497ddc940197d1773aa1f604339";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "8.1.13";
|
||||
version = "8.1.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2833679bccd507e3eac9ec931cfae85c8070a78ad1286159475b7d3b79a40dc2";
|
||||
sha256 = "8f110955a1a50e46dc03dbd969a8765b9493268153de16704767b226e4fe186e";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,45 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, django, djangorestframework, pyjwt }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, djangorestframework
|
||||
, fetchPypi
|
||||
, pyjwt
|
||||
, python-jose
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework_simplejwt";
|
||||
pname = "djangorestframework-simplejwt";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "djangorestframework_simplejwt";
|
||||
inherit version;
|
||||
sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django djangorestframework pyjwt ];
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
djangorestframework
|
||||
pyjwt
|
||||
python-jose
|
||||
];
|
||||
|
||||
# Test raises django.core.exceptions.ImproperlyConfigured
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rest_framework_simplejwt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A minimal JSON Web Token authentication plugin for Django REST Framework";
|
||||
description = "JSON Web Token authentication plugin for Django REST Framework";
|
||||
homepage = "https://github.com/davesque/django-rest-framework-simplejwt";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.arnoldfarkas ];
|
||||
maintainers = with maintainers; [ arnoldfarkas ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hap-python";
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikalchev";
|
||||
repo = "HAP-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE=";
|
||||
sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b774a2e1178a2f9812ce02119c6ee374b1ea08d34bad4c09a1ecc92d08d98f28";
|
||||
sha256 = "78309702392fe1ced000a23cfacb9bae0511ba533963b82d1d040f4a39924c09";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "proxmoxer";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09fz8zbxjaly9zqksvq6cqp66plbsyjsmndy4g25ryys45siz1ny";
|
||||
sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ let
|
|||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pname = "pyscard";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8";
|
||||
sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e";
|
||||
};
|
||||
|
||||
postPatch = if withApplePCSC then ''
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-didl-lite";
|
||||
version = "1.2.6";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1rr26dnV5As15HeFLWEDBDYPiRDHkGfYOYFhSJi7iyU=";
|
||||
sha256 = "sha256-NsZ/VQlKEp4p3JRSNQKTGvzLrKgDCkkT81NzgS3UHos=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
pname = "python-stdnum";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4248d898042a801fc4eff96fbfe4bf63a43324854efe3b5534718c1c195c6f43";
|
||||
sha256 = "374e2b5e13912ccdbf50b0b23fca2c3e0531174805c32d74e145f37756328340";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, buildPythonPackage
|
||||
, cryptography
|
||||
, cssselect
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, glibcLocales
|
||||
, installShellFiles
|
||||
|
|
@ -31,14 +31,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h";
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Scrapy";
|
||||
sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -82,7 +81,8 @@ buildPythonPackage rec {
|
|||
(fetchpatch {
|
||||
name = "remove-h2.patch";
|
||||
url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch";
|
||||
sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk";
|
||||
sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k";
|
||||
excludes = [ "tox.ini" ];
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -140,6 +140,7 @@ buildPythonPackage rec {
|
|||
range of purposes, from data mining to monitoring and automated testing.
|
||||
'';
|
||||
homepage = "https://scrapy.org/";
|
||||
changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ drewkett marsam ];
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ let
|
|||
wrappedRuby = stdenv.mkDerivation {
|
||||
name = "wrapped-ruby-${pname'}";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
inherit (ruby) gemPath meta;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
for i in ${ruby}/bin/*; do
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "actionlint";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
subPackages = [ "cmd/actionlint" ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "rhysd";
|
||||
repo = "actionlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "1516892wikz3zda0la57s8nbm6459pf4vd123rv09s4nivznbmcx";
|
||||
sha256 = "12s9ijfvnmfbcvf5lxi2jm3j7vrn7rfkas2lib5jdih77hf9270k";
|
||||
};
|
||||
|
||||
vendorSha256 = "1i7442n621jmc974b73pfz1gyqw74ilpg1zz16yxqpfh5c958m7n";
|
||||
|
|
@ -30,5 +30,6 @@ buildGoModule rec {
|
|||
changelog = "https://github.com/rhysd/actionlint/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
mainProgram = "actionlint";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,23 +125,23 @@ rec {
|
|||
headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l";
|
||||
};
|
||||
|
||||
electron_14 = mkElectron "14.1.0" {
|
||||
armv7l-linux = "25a68645cdd1356d95a8bab9488f5aeeb9a206f9b5ee2df23c2e13f87d775847";
|
||||
aarch64-linux = "94047dcf53c54f6a5520a6eb62e400174addf04fc0e3ebe04b548ca962de349a";
|
||||
x86_64-linux = "27b60841c85369a0ea8b65a8b71cdd1fb08eba80d70e855e9311f46c595874f3";
|
||||
i686-linux = "808795405d6b27221b219c2a0f7a058e3acb2e56195c87dc08828dc882ffb8e9";
|
||||
x86_64-darwin = "36d8e900bdcf5b410655e7fcb47800fa1f5a473c46acc1c4ce326822e5e95ee1";
|
||||
aarch64-darwin = "5c81f418f3f83dc6fc5893247dd386e1d23e609c83f798dd5aad451febed13c8";
|
||||
headers = "0p8lkhy97yq43sl6s4rskhdnzl520968cyh5l4fdhl2fhm5mayd4";
|
||||
electron_14 = mkElectron "14.1.1" {
|
||||
armv7l-linux = "56cbba7f15c8caeef06af50e249e26974f1a01ca7133f7b9baa35338454b4f73";
|
||||
aarch64-linux = "b9c1187d6116bd83c402b01215a2af3a6206f11de5609fa5eb5d0e75da6f8d26";
|
||||
x86_64-linux = "5bf136691dfdff9ef97f459db489dd5c4c9981e48780fb7a92ebb2e575c8dffb";
|
||||
i686-linux = "0a00bbea8a23a3d517fbdf9a8e82bc51a2276af57a1ee10793cffb8a2178a45f";
|
||||
x86_64-darwin = "388c88d3b7c7b69d524b143c26d1e13f08e5192aad1197bfa955f56ff38ce9b3";
|
||||
aarch64-darwin = "a3b17406a28553a04576199adb68b2c78a1c457e78985f5648231bbf9b367832";
|
||||
headers = "1pw67w9l63xgkwp78wmnxfjgyzlrmij27bapd2yjrvj6ag7j9xgy";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.1.1" {
|
||||
armv7l-linux = "902711052fdb0e7bfcded9396aa24fd5bcf6fcc5f70548f51396d75a45cd6645";
|
||||
aarch64-linux = "05b24c409a6dbf83b5f64f2d8904fa37cf71259c46beaaabd4b9a5ba75d03cd3";
|
||||
x86_64-linux = "70de2da51c6a8591b88f08366c82166a51b1719243f67ef1a14eddbb806a115f";
|
||||
i686-linux = "30f4be4dcf06c6dda953af94dd14a232767592f69e7f408def1a5b58dab054ea";
|
||||
x86_64-darwin = "ddfab707063a79f25a95983abeba6ef4e581d53b6f26e7667fde4fd11c5547b0";
|
||||
aarch64-darwin = "8db2ff70446e081311bb1d5cc8a13fd66e7143046747f87cdb07b139d973bb89";
|
||||
headers = "1hfgxk1iyzg6jr36s78l3m3g8433gna6l1n2jz33mz9iw66wgy27";
|
||||
electron_15 = mkElectron "15.1.2" {
|
||||
armv7l-linux = "fd176f658478c56355adb0ee81949f1b1bd073a86afba54ebb703923b99ff5f0";
|
||||
aarch64-linux = "9493f410e983cb6a11f24375ea7959cc3e8ccab3b805b6095f4dafc9fa548e67";
|
||||
x86_64-linux = "7acb839f6bf9bc95ae7ce26722fb6c5e9fd09bb9d58b674415bf92bded3b808e";
|
||||
i686-linux = "018a5546baff524a649fe34957eddb88c30811dae6bd2c3bd110d15b41bc8554";
|
||||
x86_64-darwin = "f95f70790fa689684ec2d4822451e45968a2307ccd674a4378a89667f1e2c50d";
|
||||
aarch64-darwin = "edcfb7e83c5edad21b05d9babb4a2840157e68dbe4278c3ab3b609ece22e1372";
|
||||
headers = "093ndqsqxk0k13rpdnpsjajf9a9599crzhhb412xlvzf8kzdzhxy";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "16.10.0";
|
||||
sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p";
|
||||
version = "16.11.0";
|
||||
sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk";
|
||||
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -315,9 +315,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
|
|||
++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf
|
||||
# Removed util-linuxMinimal since it should not be a dependency.
|
||||
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
|
||||
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ]
|
||||
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ]
|
||||
++ optional (lib.versionAtLeast version "5.8") elfutils
|
||||
++ optional (lib.versionAtLeast version "5.2") zlib
|
||||
;
|
||||
|
||||
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.10.0";
|
||||
version = "2021.10.2";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
"edimax" = ps: with ps; [ pyedimax ];
|
||||
"edl21" = ps: with ps; [ pysml ];
|
||||
"ee_brightbox" = ps: with ps; [ eebrightbox ];
|
||||
"efergy" = ps: with ps; [ ]; # missing inputs: pyefergy
|
||||
"efergy" = ps: with ps; [ pyefergy ];
|
||||
"egardia" = ps: with ps; [ pythonegardia ];
|
||||
"eight_sleep" = ps: with ps; [ pyeight ];
|
||||
"elgato" = ps: with ps; [ elgato ];
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.10.0";
|
||||
hassVersion = "2021.10.2";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "0m54ynx0i4a6wljg6d9i6xa79c15cqah5cgaswgrbaxhjw5q78iv";
|
||||
sha256 = "0nds4491v8wy4d8w842asjpjj7xhqghlq0h61i7z6wp8jln7m418";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
@ -770,6 +770,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"
|
||||
# tado/test_climate.py: Tries to connect to my.tado.com
|
||||
"--deselect tests/components/tado/test_climate.py::test_air_con"
|
||||
"--deselect tests/components/tado/test_climate.py::test_heater"
|
||||
# helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
|
||||
"--deselect tests/helpers/test_system_info.py::test_container_installationtype"
|
||||
# tests are located in tests/
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ buildPythonPackage rec {
|
|||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20211006.0";
|
||||
version = "20211007.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rlscTHqa1TMsIVW7kWFGR/feak0XewDRkybpo8dPXj0=";
|
||||
sha256 = "sha256-GchSCqdVPk8RVe4iNEVvrsIgrV9/CHE5bQwyaT+ErvU=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -452,6 +452,16 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
upload = {
|
||||
src = fetchFromGitHub {
|
||||
name = "upload";
|
||||
owner = "fdintino";
|
||||
repo = "nginx-upload-module";
|
||||
rev = "2.3.0";
|
||||
sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU=";
|
||||
};
|
||||
};
|
||||
|
||||
upstream-check = {
|
||||
src = fetchFromGitHub {
|
||||
name = "upstream-check";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 36ffbb7ad2c535180cae473b470a43f9db4fbdcd Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Mon, 16 Aug 2021 13:27:28 +0200
|
||||
Subject: [PATCH] setup: add homeserver as console script
|
||||
Subject: [PATCH 1/2] setup: add homeserver as console script
|
||||
|
||||
With this change, it will be added to `$out/bin` in `nixpkgs` directly.
|
||||
This became necessary since our old workaround, calling it as script,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
From 3089758015c64cc1e6788793c4fe40a0e1783457 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Tue, 5 Oct 2021 22:33:12 +0200
|
||||
Subject: [PATCH 2/2] Expose generic worker as binary under NixOS
|
||||
|
||||
---
|
||||
setup.py | 3 ++-
|
||||
synapse/app/generic_worker.py | 6 +++++-
|
||||
2 files changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 27f1d842c..6383aed6f 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -135,7 +135,8 @@ setup(
|
||||
python_requires="~=3.6",
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
- 'homeserver = synapse.app.homeserver:main'
|
||||
+ 'homeserver = synapse.app.homeserver:main',
|
||||
+ 'worker = synapse.app.generic_worker:main'
|
||||
]
|
||||
},
|
||||
classifiers=[
|
||||
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
|
||||
index 3b7131af8..c77a6a95c 100644
|
||||
--- a/synapse/app/generic_worker.py
|
||||
+++ b/synapse/app/generic_worker.py
|
||||
@@ -491,6 +491,10 @@ def start(config_options):
|
||||
_base.start_worker_reactor("synapse-generic-worker", config)
|
||||
|
||||
|
||||
-if __name__ == "__main__":
|
||||
+def main():
|
||||
with LoggingContext("main"):
|
||||
start(sys.argv[1:])
|
||||
+
|
||||
+
|
||||
+if __name__ == "__main__":
|
||||
+ main()
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -36,6 +36,7 @@ buildPythonApplication rec {
|
|||
|
||||
patches = [
|
||||
./0001-setup-add-homeserver-as-console-script.patch
|
||||
./0002-Expose-generic-worker-as-binary-under-NixOS.patch
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001
|
||||
From 8823e48b055b7e574c08069048ba21ffa4393699 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Fullmer <danielrf12@gmail.com>
|
||||
Date: Fri, 21 Feb 2020 21:52:00 -0500
|
||||
Subject: [PATCH] Don't use file timestamp in cache filename
|
||||
|
|
@ -14,13 +14,13 @@ unique.
|
|||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/web/includes/functions.php b/web/includes/functions.php
|
||||
index 19567a5c1..0242c09bc 100644
|
||||
index 89d2cc8ad..52cbb6f38 100644
|
||||
--- a/web/includes/functions.php
|
||||
+++ b/web/includes/functions.php
|
||||
@@ -2223,7 +2223,8 @@ function cache_bust($file) {
|
||||
@@ -1941,7 +1941,8 @@ function cache_bust($file) {
|
||||
$parts = pathinfo($file);
|
||||
global $css;
|
||||
$dirname = preg_replace('/\//', '_', $parts['dirname']);
|
||||
$dirname = str_replace('/', '_', $parts['dirname']);
|
||||
- $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
|
||||
+ $srcHash = '@srcHash@';
|
||||
+ $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension'];
|
||||
|
|
@ -28,5 +28,4 @@ index 19567a5c1..0242c09bc 100644
|
|||
return 'cache/'.$cacheFile;
|
||||
} else {
|
||||
--
|
||||
2.25.1
|
||||
|
||||
2.32.0
|
||||
|
|
|
|||
|
|
@ -78,13 +78,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.34.22";
|
||||
version = "1.36.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
|
||||
sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -130,7 +131,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
|
||||
scripts/zmupdate.pl.in \
|
||||
src/zm_config.h.in \
|
||||
src/zm_config_data.h.in \
|
||||
web/api/app/Config/bootstrap.php.in \
|
||||
web/includes/config.php.in ; do
|
||||
substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
|||
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
|
||||
postPatch = ''
|
||||
sed -i '/CC=\/usr/d' makefile.macosx_llvm_64bits
|
||||
# Avoid writing timestamps into compressed manpages
|
||||
# to maintain determinism.
|
||||
substituteInPlace install.sh --replace 'gzip' 'gzip -n'
|
||||
chmod +x install.sh
|
||||
|
||||
# I think this is a typo and should be CXX? Either way let's kill it
|
||||
|
|
|
|||
2
pkgs/tools/audio/botamusique/node-packages.nix
generated
2
pkgs/tools/audio/botamusique/node-packages.nix
generated
|
|
@ -4527,7 +4527,7 @@ let
|
|||
name = "botamusique";
|
||||
packageName = "botamusique";
|
||||
version = "0.0.0";
|
||||
src = ../../../../../../../../../tmp/tmp.UAoivnXH3n;
|
||||
src = ../../../../../../../../../tmp/tmp.IOzfGq3zuo;
|
||||
dependencies = [
|
||||
sources."@babel/code-frame-7.10.4"
|
||||
sources."@babel/compat-data-7.12.7"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{
|
||||
"url": "https://github.com/azlux/botamusique",
|
||||
"rev": "ba02cdebf2e175dc371995361eafcb88ad2c1b52",
|
||||
"date": "2021-06-01T23:39:44+02:00",
|
||||
"path": "/nix/store/dp5vnj7zqv1sp1ab5xycvvqdpia9xb71-botamusique",
|
||||
"sha256": "01d51y6h38hs4ynjgz050ryy14sp5y2c3n7f80mcv0a4ls8413qp",
|
||||
"rev": "3733353170e1d24b5f3ce2a21643c27ca2a39835",
|
||||
"date": "2021-09-01T12:19:37+02:00",
|
||||
"path": "/nix/store/07vl4lhi6dshh4n7pcyrxvy9m028rrbr-botamusique",
|
||||
"sha256": "0cggan70zymbh9iwggq9a04zkky86k9cncprxb9nnr35gp4l4992",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
|
|
|
|||
|
|
@ -10,28 +10,21 @@ let
|
|||
packageOverrides = self: super: {
|
||||
|
||||
click = super.click.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "7.1.2";
|
||||
version = "8.0.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
|
||||
sha256 = "0ymdyf37acq4qxh038q0xx44qgj6y2kf0jd0ivvix6qij88w214c";
|
||||
};
|
||||
});
|
||||
|
||||
arrow = super.arrow.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.3";
|
||||
version = "1.2.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0793badh4hgbk2c5g70hmbl7n3d4g5d87bcflld0w9rjwy59r71r";
|
||||
sha256 = "0x70a057dqki2z1ny491ixbg980hg4lihc7g1zmy69g4v6xjkz0n";
|
||||
};
|
||||
});
|
||||
|
||||
sh = super.sh.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.14.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "13hxgifab9ichla13qaa7sh8r0il7vs1r21js72s0n355zr9mair";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
@ -39,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gitlint";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorisroovers";
|
||||
repo = "gitlint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CqmE4V+svSuQAsoX0I3NpUqPU5CQf3fyCHJPrjUjHF4=";
|
||||
sha256 = "1j6gfgqin5dmqd2qq0vib55d2r07s9sy4hwrvwlichxx5jjwncly";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,28 +2,29 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mtm";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadpixi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0b2arkmbmabxmrqxlpvvvhll2qx0xgj7r4r6p0ymnm9p70idris4";
|
||||
sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace Makefile --replace "strip -s mtm" ""
|
||||
makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin/ $out/share/man/man1
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin mtm
|
||||
install -Dm644 -t $out/share/man/man1 mtm.1
|
||||
|
||||
runHook postInstall
|
||||
postInstall = ''
|
||||
mkdir -p $terminfo/share/terminfo $out/nix-support
|
||||
tic -x -o $terminfo/share/terminfo mtm.ti
|
||||
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tremor";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tremor-rs";
|
||||
repo = "tremor-runtime";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE=";
|
||||
sha256 = "1ldqa4q7q9afrbjh7adinav21zsh26pqqvrd6q9542r90mxnygmx";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI=";
|
||||
cargoSha256 = "0ivxd5mhvcpzv9wf859vwyiq1s0bbd9vdk6fy6m81bn5ykihx7ar";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, python3
|
||||
, installShellFiles
|
||||
, libxml2
|
||||
, openssl
|
||||
, curl
|
||||
|
|
@ -21,6 +23,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -35,9 +39,16 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4=";
|
||||
|
||||
postInstall = ''
|
||||
python ci/gen_manpage.py docs/hurl.md > hurl.1
|
||||
python ci/gen_manpage.py docs/hurlfmt.md > hurlfmt.1
|
||||
installManPage hurl.1 hurlfmt.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line tool that performs HTTP requests defined in a simple plain text format.";
|
||||
homepage = "https://hurl.dev/";
|
||||
changelog = "https://github.com/Orange-OpenSource/hurl/raw/${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ eonpatapon ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,25 +1,30 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nixosTests
|
||||
, libnfnetlink, libnl, net-snmp, openssl
|
||||
, pkg-config, autoreconfHook }:
|
||||
, file, libmnl, libnftnl, libnl
|
||||
, net-snmp, openssl, pkg-config
|
||||
, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepalived";
|
||||
version = "2.2.2";
|
||||
version = "2.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acassen";
|
||||
repo = "keepalived";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw=";
|
||||
sha256 = "sha256-WXKu+cabMmXNHiLwXrQqS8GQHIWYkee7vPddyGURWic=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libnfnetlink
|
||||
file
|
||||
libmnl
|
||||
libnftnl
|
||||
libnl
|
||||
net-snmp
|
||||
openssl
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.keepalived = nixosTests.keepalived;
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
@ -32,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://keepalived.org";
|
||||
description = "Routing software written in C";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-10-06";
|
||||
version = "2021-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MTV6rDgy6FxmdQHoBnDNBwiKEiGj9THqoHJCwUoAoB8=";
|
||||
sha256 = "sha256-VdiZFUl2vZRocwR+398fJa602wWIiB1URU+54X2XiDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knockpy";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guelfoweb";
|
||||
repo = "knock";
|
||||
rev = version;
|
||||
sha256 = "sha256-4W6/omGPmQFuZ/2AVNgCs2q0ti/P8OY4o7b4/g9q+Rc=";
|
||||
sha256 = "sha256-QPOIpgJt+09zRvSavRxuVEN+GGk4Z1CYCXti37YaO7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.8"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.9"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: d50b53eafca062b7270a91894e4e9de7a526aa10
|
||||
ref: refs/tags/6.1.8
|
||||
revision: 1e520ab4a5779648de889d198100af4eb556a7f6
|
||||
ref: refs/tags/6.1.9
|
||||
specs:
|
||||
metasploit-framework (6.1.8)
|
||||
metasploit-framework (6.1.9)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -87,6 +87,7 @@ GIT
|
|||
tzinfo-data
|
||||
unix-crypt
|
||||
warden
|
||||
win32api
|
||||
windows_error
|
||||
winrm
|
||||
xdr
|
||||
|
|
@ -127,19 +128,19 @@ GEM
|
|||
arel-helpers (2.12.1)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.510.0)
|
||||
aws-partitions (1.512.0)
|
||||
aws-sdk-core (3.121.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.265.0)
|
||||
aws-sdk-ec2 (1.266.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.61.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.48.0)
|
||||
aws-sdk-kms (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.103.0)
|
||||
|
|
@ -404,7 +405,7 @@ GEM
|
|||
ttfunk (1.7.0)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
tzinfo-data (1.2021.2)
|
||||
tzinfo-data (1.2021.3)
|
||||
tzinfo (>= 1.0.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
|
|
@ -416,6 +417,7 @@ GEM
|
|||
websocket-driver (0.7.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
win32api (0.1.0)
|
||||
windows_error (0.1.2)
|
||||
winrm (2.3.6)
|
||||
builder (>= 2.1.2)
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.8";
|
||||
version = "6.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-KDexgv5rsaOyAJhaiLiU1z0st7ncwIayoqn+fvJnSng=";
|
||||
sha256 = "sha256-ZhNy6rp3Jdrua1dZr3dTQxLOVAflWiI0lc/f38d0kqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/rapid7/metasploit-framework/wiki";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.makefu ];
|
||||
maintainers = with maintainers; [ fab makefu ];
|
||||
mainProgram = "msfconsole";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lszcza7k1jc57pivjajz1bdgsg3bxfp60phsidv729yhjw3yzwv";
|
||||
sha256 = "09v7z0sg09vsysv0hm1552b3laa8sf933c0sqnb35mb4wksj1fv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.510.0";
|
||||
version = "1.512.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
|
|
@ -124,10 +124,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ymrwsc1caf9rfl5613w1xpckzx7v9l4y20dpmzzq72ih0y6lijn";
|
||||
sha256 = "0bwkgmdas7ig52cbfdx6vf63j8qk91lizd7sdjdapbfnabbpwmq1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.265.0";
|
||||
version = "1.266.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -144,10 +144,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0aa7n3bad4h8sipzb31inc0q2r5k2nviaihmhqdv7mqnpylvcgia";
|
||||
sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.48.0";
|
||||
version = "1.49.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -664,12 +664,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "d50b53eafca062b7270a91894e4e9de7a526aa10";
|
||||
sha256 = "0y2aczr7xzm9lar8dh6wp6vjqgfpjjw8hnlq02ra7cbbzs1b2dr8";
|
||||
rev = "1e520ab4a5779648de889d198100af4eb556a7f6";
|
||||
sha256 = "19wjfk3xzpygjls24np50xacw4j3advsynapdgpdl9bppbm744v6";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.8";
|
||||
version = "6.1.9";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1477,10 +1477,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1a0d3smxpdn6i5vjc616wnva8c9nvh8mvsjyvwcxlsj1qsih2l21";
|
||||
sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2021.2";
|
||||
version = "1.2021.3";
|
||||
};
|
||||
unf = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1552,6 +1552,16 @@
|
|||
};
|
||||
version = "0.1.5";
|
||||
};
|
||||
win32api = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1liryy0pz0gpw5sadbb9xwaflay272b8bwv4pclh6wkhldnh7wg7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.0";
|
||||
};
|
||||
windows_error = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terrascan";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accurics";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE=";
|
||||
sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0=";
|
||||
vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";
|
||||
|
||||
# Tests want to download a vulnerable Terraform project
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -5621,6 +5621,16 @@ with pkgs;
|
|||
|
||||
gnuapl = callPackage ../development/interpreters/gnu-apl { };
|
||||
|
||||
dapl = callPackage ../development/interpreters/dzaima-apl {
|
||||
buildNativeImage = false;
|
||||
stdenv = stdenvNoCC;
|
||||
jdk = jre;
|
||||
};
|
||||
dapl-native = callPackage ../development/interpreters/dzaima-apl {
|
||||
buildNativeImage = true;
|
||||
jdk = graalvm11-ce;
|
||||
};
|
||||
|
||||
gnucap = callPackage ../applications/science/electronics/gnucap { };
|
||||
|
||||
gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue