forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
76cceffaf9
|
|
@ -374,6 +374,13 @@
|
|||
<link linkend="opt-services.expressvpn.enable">services.expressvpn</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://troglobit.com/projects/merecat/">merecat</link>,
|
||||
a small and easy HTTP server based on thttpd. Available as
|
||||
<link linkend="opt-services.merecat.enable">services.merecat</link>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/L11R/go-autoconfig">go-autoconfig</link>,
|
||||
|
|
|
|||
|
|
@ -126,6 +126,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).
|
||||
|
||||
- [merecat](https://troglobit.com/projects/merecat/), a small and easy HTTP server based on thttpd. Available as [services.merecat](#opt-services.merecat.enable)
|
||||
|
||||
- [go-autoconfig](https://github.com/L11R/go-autoconfig), IMAP/SMTP autodiscover server. Available as [services.go-autoconfig](#opt-services.go-autoconfig.enable).
|
||||
|
||||
- [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable).
|
||||
|
|
|
|||
|
|
@ -1156,6 +1156,7 @@
|
|||
./services/web-servers/lighttpd/collectd.nix
|
||||
./services/web-servers/lighttpd/default.nix
|
||||
./services/web-servers/lighttpd/gitweb.nix
|
||||
./services/web-servers/merecat.nix
|
||||
./services/web-servers/mighttpd2.nix
|
||||
./services/web-servers/minio.nix
|
||||
./services/web-servers/molly-brown.nix
|
||||
|
|
|
|||
|
|
@ -148,6 +148,15 @@ in {
|
|||
default = 2;
|
||||
description = lib.mdDoc "Log level value between 0 (DEBUG) and 4 (FATAL).";
|
||||
};
|
||||
logType = mkOption {
|
||||
type = types.enum [ "errorlog" "file" "syslog" "systemd" ];
|
||||
default = "syslog";
|
||||
description = lib.mdDoc ''
|
||||
Logging backend to use.
|
||||
systemd requires the php-systemd package to be added to services.nextcloud.phpExtraExtensions.
|
||||
See the [nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/logging_configuration.html) for details.
|
||||
'';
|
||||
};
|
||||
https = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
|
@ -758,7 +767,7 @@ in {
|
|||
'datadirectory' => '${datadir}/data',
|
||||
'skeletondirectory' => '${cfg.skeletonDirectory}',
|
||||
${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
|
||||
'log_type' => 'syslog',
|
||||
'log_type' => '${cfg.logType}',
|
||||
'loglevel' => '${builtins.toString cfg.logLevel}',
|
||||
${optionalString (c.overwriteProtocol != null) "'overwriteprotocol' => '${c.overwriteProtocol}',"}
|
||||
${optionalString (c.dbname != null) "'dbname' => '${c.dbname}',"}
|
||||
|
|
|
|||
55
nixos/modules/services/web-servers/merecat.nix
Normal file
55
nixos/modules/services/web-servers/merecat.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.merecat;
|
||||
format = pkgs.formats.keyValue {
|
||||
mkKeyValue = generators.mkKeyValueDefault {
|
||||
mkValueString = v:
|
||||
# In merecat.conf, booleans are "true" and "false"
|
||||
if builtins.isBool v
|
||||
then if v then "true" else "false"
|
||||
else generators.mkValueStringDefault {} v;
|
||||
} "=";
|
||||
};
|
||||
configFile = format.generate "merecat.conf" cfg.settings;
|
||||
|
||||
in {
|
||||
|
||||
options.services.merecat = {
|
||||
|
||||
enable = mkEnableOption (lib.mdDoc "Merecat HTTP server");
|
||||
|
||||
settings = mkOption {
|
||||
inherit (format) type;
|
||||
default = { };
|
||||
description = lib.mdDoc ''
|
||||
Merecat configuration. Refer to merecat(8) for details on supported values.
|
||||
'';
|
||||
example = {
|
||||
hostname = "localhost";
|
||||
port = 8080;
|
||||
virtual-host = true;
|
||||
directory = "/srv/www";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.merecat = {
|
||||
description = "Merecat HTTP server";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${pkgs.merecat}/bin/merecat -n -f ${configFile}";
|
||||
AmbientCapabilities = lib.mkIf ((cfg.settings.port or 80) < 1024) [ "CAP_NET_BIND_SERVICE" ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1356,8 +1356,8 @@ in
|
|||
"net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
|
||||
# networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"
|
||||
"net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;
|
||||
} // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
|
||||
(i: [(nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)]))
|
||||
} // listToAttrs (forEach interfaces
|
||||
(i: nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" i.proxyARP))
|
||||
// listToAttrs (forEach interfaces
|
||||
(i: let
|
||||
opt = i.tempAddress;
|
||||
|
|
|
|||
|
|
@ -368,6 +368,7 @@ in {
|
|||
mediawiki = handleTest ./mediawiki.nix {};
|
||||
meilisearch = handleTest ./meilisearch.nix {};
|
||||
memcached = handleTest ./memcached.nix {};
|
||||
merecat = handleTest ./merecat.nix {};
|
||||
metabase = handleTest ./metabase.nix {};
|
||||
minecraft = handleTest ./minecraft.nix {};
|
||||
minecraft-server = handleTest ./minecraft-server.nix {};
|
||||
|
|
|
|||
28
nixos/tests/merecat.nix
Normal file
28
nixos/tests/merecat.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "merecat";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
services.merecat = {
|
||||
enable = true;
|
||||
settings = {
|
||||
hostname = "localhost";
|
||||
virtual-host = true;
|
||||
directory = toString (pkgs.runCommand "merecat-webdir" {} ''
|
||||
mkdir -p $out/foo.localhost $out/bar.localhost
|
||||
echo '<h1>Hello foo</h1>' > $out/foo.localhost/index.html
|
||||
echo '<h1>Hello bar</h1>' > $out/bar.localhost/index.html
|
||||
'');
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("merecat")
|
||||
machine.wait_for_open_port(80)
|
||||
machine.succeed("curl --fail foo.localhost | grep 'Hello foo'")
|
||||
machine.succeed("curl --fail bar.localhost | grep 'Hello bar'")
|
||||
'';
|
||||
})
|
||||
|
|
@ -40,13 +40,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "keepassxc";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = version;
|
||||
sha256 = "sha256-mtOnUB6+iBBqgPT5KKhEX4M7UUM3s5fT0OTePE6THXw=";
|
||||
sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [
|
||||
|
|
|
|||
|
|
@ -74,6 +74,15 @@
|
|||
"vendorHash": null,
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"argocd": {
|
||||
"hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=",
|
||||
"owner": "oboukili",
|
||||
"provider-source-address": "registry.terraform.io/oboukili/argocd",
|
||||
"repo": "terraform-provider-argocd",
|
||||
"rev": "v4.1.0",
|
||||
"vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-kyQBl/gdTj1Dlu4/FFowAQbBDTYMjp0JGQ09eBqwHEc=",
|
||||
"owner": "auth0",
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, fixup_yarn_lock
|
||||
, nodejs
|
||||
, jitsi-meet
|
||||
, applyPatches
|
||||
, conf ? { }
|
||||
}:
|
||||
|
||||
|
|
@ -24,11 +25,14 @@ in stdenv.mkDerivation rec {
|
|||
pname = "element-web";
|
||||
inherit (pinData) version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = pinData.webSrcHash;
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = pinData.webSrcHash;
|
||||
};
|
||||
patches = [ ./regenerate-element-web-yarn.lock.diff ];
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "1.11.10",
|
||||
"desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=",
|
||||
"desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84",
|
||||
"webSrcHash": "r7WZUWgPDEBS9xpc1YmmPVGch7B2ouJOFAoKdcC/55Q=",
|
||||
"webYarnHash": "0s8wxf13jc9x4zykhm4abgq3a38mjya7z43kjsags1fxhilf09bc"
|
||||
"version": "1.11.12",
|
||||
"desktopSrcHash": "85mH9y3/IlThrdZY4Nv6iZQ8SxVGoYcZ1bbkCuAAroU=",
|
||||
"desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5",
|
||||
"webSrcHash": "MfiPrTw7BFLFPbm6xR5QbQHNPYpaJBtZES6KjISMTeE=",
|
||||
"webYarnHash": "sha256-KZNBocVEs3wD5020h6C4n2jgp4shv4IgFENSi87rUFM="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/yarn.lock b/yarn.lock
|
||||
index 1581f599f..910764c86 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0:
|
||||
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
|
||||
integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
|
||||
|
||||
+browser-request@^0.3.3:
|
||||
+ version "0.3.3"
|
||||
+ resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
|
||||
+ integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==
|
||||
+
|
||||
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
|
||||
@@ -8177,7 +8182,6 @@ matrix-js-sdk@21.0.0:
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
another-json "^0.2.0"
|
||||
- browser-request "^0.3.3"
|
||||
bs58 "^5.0.0"
|
||||
content-type "^1.0.4"
|
||||
loglevel "^1.7.1"
|
||||
@@ -8208,7 +8212,6 @@ matrix-react-sdk@3.59.0:
|
||||
"@types/ua-parser-js" "^0.7.36"
|
||||
await-lock "^2.1.0"
|
||||
blurhash "^1.1.3"
|
||||
- browser-request "^0.3.3"
|
||||
cheerio "^1.0.0-rc.9"
|
||||
classnames "^2.2.6"
|
||||
commonmark "^0.29.3"
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github
|
||||
|
||||
# FIXME should fix itself on the next release -> remove the warning if that's the case
|
||||
echo "WARNING: on the last update, the yarn.lock had to be patched. Please be careful when updating the hashes!"
|
||||
|
||||
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
|
||||
echo "Regenerates packaging data for the element packages."
|
||||
echo "Usage: $0 [git release tag]"
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evcxr";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "evcxr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gB56fGjL/YtzQI+vr83URPhQ6qXrCn5IRPnIYBt8iHk=";
|
||||
sha256 = "sha256-sdvBAmINl/3Hv9gnPVruI5lCuSu1VQ9swY0GNJrsEVk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DAbg5G1oGnfBR1kIUt7ebYEx06b6sbexqLyFJ7zKhlk=";
|
||||
cargoSha256 = "sha256-wKoseZTAZOeT0LEHTlnO5cMpYx6sinnQkEVXCYXupAY=";
|
||||
|
||||
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
|
||||
|
||||
|
|
|
|||
|
|
@ -856,4 +856,26 @@ rec {
|
|||
readmeFile = "README_hr_HR.txt";
|
||||
license = with lib.licenses; [ gpl2Only lgpl21Only mpl11 ];
|
||||
};
|
||||
|
||||
/* NORWEGIAN */
|
||||
|
||||
nb_NO = nb-no;
|
||||
nb-no = mkDictFromLibreOffice {
|
||||
shortName = "nb-no";
|
||||
dictFileName = "nb_NO";
|
||||
sourceRoot = "no";
|
||||
readmeFile = "README_hyph_NO.txt";
|
||||
shortDescription = "Norwegian Bokmål (Norway)";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
};
|
||||
|
||||
nn_NO = nn-no;
|
||||
nn-no = mkDictFromLibreOffice {
|
||||
shortName = "nn-no";
|
||||
dictFileName = "nn_NO";
|
||||
sourceRoot = "no";
|
||||
readmeFile = "README_hyph_NO.txt";
|
||||
shortDescription = "Norwegian Nynorsk (Norway)";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
35
pkgs/development/libraries/luabridge/default.nix
Normal file
35
pkgs/development/libraries/luabridge/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "luabridge";
|
||||
version = "2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinniefalco";
|
||||
repo = "LuaBridge";
|
||||
rev = version;
|
||||
sha256 = "sha256-gXrBNzE41SH98Xz480+uHQlxHjMHzs23AImxil5LZ0g=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/include
|
||||
cp -r Source/LuaBridge $out/include
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight, dependency-free library for binding Lua to C++";
|
||||
homepage = "https://github.com/vinniefalco/LuaBridge";
|
||||
changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
};
|
||||
}
|
||||
|
|
@ -51,7 +51,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = lib.optionals stdenv.cc.isClang [
|
||||
"compiler=clang"
|
||||
];
|
||||
] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
|
||||
(if stdenv.hostPlatform.isAarch64 then "arch=arm64"
|
||||
else if stdenv.hostPlatform.isx86_64 then "arch=intel64"
|
||||
else throw "Unsupported cross architecture"));
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopg";
|
||||
version = "1.3.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "1.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZHfwuDtQm7SlLX3sAoYONgCIWnafOj/L8bXjAdwYDKI=";
|
||||
hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,7 +33,9 @@ buildPythonPackage rec {
|
|||
# Tests requires a PostgreSQL Docker instance
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiopg" ];
|
||||
pythonImportsCheck = [
|
||||
"aiopg"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing a PostgreSQL database";
|
||||
|
|
|
|||
|
|
@ -26,10 +26,12 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
# test_peer_interface hits a timeout
|
||||
# test_tcp_connection_with_forwarding fails due to dbus
|
||||
# creating unix socket anyway on v1.14.4
|
||||
checkPhase = ''
|
||||
dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
${python.interpreter} -m pytest -sv --cov=dbus_next \
|
||||
-k "not test_peer_interface"
|
||||
-k "not test_peer_interface and not test_tcp_connection_with_forwarding"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ducc0";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
owner = "mtr";
|
||||
repo = "ducc";
|
||||
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "p5TW8utFDlN80zD6hvWPcmM2DfKqvEuOzRUtTvLwNT0=";
|
||||
sha256 = "sha256-Z3eWuLuuA264z1ccdVp1YwAjDrLIXFxvTt/gC/zBE6o=";
|
||||
};
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rustPlatform
|
||||
, setuptools-rust
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy-wireguard";
|
||||
version = "0.1.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "decathorpe";
|
||||
repo = "mitmproxy_wireguard";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-31S955juthagoFsthVTf3Vjx2YCKn43HKJ6mjrA8lfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-rust
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
]);
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-e2P3vfiaTOUf28Lexv2SDFaiGE55G8EkDKSYb8b7vLM=";
|
||||
};
|
||||
|
||||
# Module has no tests, only a test client
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mitmproxy_wireguard"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WireGuard frontend for mitmproxy";
|
||||
homepage = "https://github.com/decathorpe/mitmproxy_wireguard";
|
||||
changelog = "https://github.com/decathorpe/mitmproxy_wireguard/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "psycopg2";
|
||||
version = "2.9.3";
|
||||
outputs = [ "out" "doc" ];
|
||||
version = "2.9.5";
|
||||
format = "setuptools";
|
||||
|
||||
# Extension modules don't work well with PyPy. Use psycopg2cffi instead.
|
||||
# c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
|
||||
|
|
@ -21,9 +21,11 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981";
|
||||
sha256 = "sha256-pSRtLmg6ly4hh6hxS1ws+BVsBkYp+amxqHPBcw2eJFo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
postgresql
|
||||
sphinxHook
|
||||
|
|
@ -36,15 +38,17 @@ buildPythonPackage rec {
|
|||
|
||||
sphinxRoot = "doc/src";
|
||||
|
||||
# requires setting up a postgresql database
|
||||
# Requires setting up a PostgreSQL database
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "psycopg2" ];
|
||||
pythonImportsCheck = [
|
||||
"psycopg2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PostgreSQL database adapter for the Python programming language";
|
||||
homepage = "https://www.psycopg.org";
|
||||
license = with licenses; [ lgpl3 zpl20 ];
|
||||
license = with licenses; [ lgpl3Plus zpl20 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytile";
|
||||
version = "2022.02.0";
|
||||
version = "2022.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IGjM9yU/3EjO9sV1ZZUX7RUL/a6CcMPzANhVMTcbZGU=";
|
||||
sha256 = "sha256-fxtDqbslUyV/Otwy9MPIC8DSepTnEZiJKzeU8nlsnWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.91";
|
||||
version = "0.0.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KAifSlIFJPw0A83pH6kZz2fCmYf6QVmuhAwZWtXEV3o=";
|
||||
sha256 = "sha256-PTlLxFtp1IdHobhwN4zoxVQgDDc8CAG4q5YD2DqQ7oM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Zy6RQwRc3IYzK+pFs/CsZXZoRmnUfWeZTGpxjHTl6dY=";
|
||||
cargoSha256 = "sha256-bhOT0kecoJL/DqOkYVgKZojV2U+nX0/ckWCPb8Zchu4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
# for determining the latest compatible linuxPackages
|
||||
, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
|
||||
, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -227,17 +228,17 @@ in {
|
|||
|
||||
zfsUnstable = common {
|
||||
# check the release notes for compatible kernels
|
||||
kernelCompatible = kernel.kernelOlder "5.20";
|
||||
latestCompatibleLinuxPackages = linuxPackages_5_19;
|
||||
kernelCompatible = kernel.kernelOlder "6.1";
|
||||
latestCompatibleLinuxPackages = linuxPackages_6_0;
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||
# zfs-<version>-staging branch, because this is tested by the OpenZFS
|
||||
# maintainers.
|
||||
version = "2.1.6";
|
||||
# rev = "0000000000000000000000000000000000000000";
|
||||
version = "2.1.7-staging-2022-10-27";
|
||||
rev = "04f1983aab16d378be376768275856bc38be48bd";
|
||||
|
||||
sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
|
||||
sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg=";
|
||||
|
||||
isUnstable = true;
|
||||
};
|
||||
|
|
|
|||
52
pkgs/servers/http/merecat/default.nix
Normal file
52
pkgs/servers/http/merecat/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, libconfuse
|
||||
, libxcrypt
|
||||
, testers
|
||||
, merecat
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "merecat";
|
||||
version = "2.31";
|
||||
|
||||
# Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${version}.tar.xz
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "merecat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oIzOXUnCFqd3HPyKp58r+enRRpaE7f9hqNITtxCCB7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libconfuse
|
||||
libxcrypt
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
testVersion = testers.testVersion {
|
||||
package = merecat;
|
||||
command = "merecat -V";
|
||||
};
|
||||
inherit (nixosTests) merecat;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small and made-easy HTTP/HTTPS server based on Jef Poskanzer's thttpd";
|
||||
homepage = "https://troglobit.com/projects/merecat/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
# Strange header and/or linker errors
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -11,20 +11,20 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.70.0";
|
||||
version = "1.70.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SkPQPkSF6cppCS58e7wtkBh4nIFekt1O7qbpA6T0lEk=";
|
||||
hash = "sha256-/clEY3sabaDEOAAowQ896vYOvzf5Teevoa7ZkzWw+fY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ucfk2rWU4k9kDIBgbOgp+3ORog/66FgZ90qxF33IuC4=";
|
||||
hash = "sha256-9wxWxrn+uPcz60710DROhDqNC6FvTtnqzWiWRk8kl6A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "9.2.1";
|
||||
version = "9.2.2";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||
|
||||
|
|
@ -10,12 +10,12 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-0TMvSILkT29Ebm/P3PK1NKNs+TbE+874aDRybahhMGg=";
|
||||
sha256 = "sha256-oXtEAhyCwV9DQfrun9rTPTeTCuzMv2l0sVyi2+pOASw=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-yL6qyAOZT47eiPkdxeBARkChP0L4vj1y7LDvrPUBmQQ=";
|
||||
sha256 = "sha256-trbc2iNDhBa72J15wPZKIlNJHbQUzE6cz/0TmivXJxE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-021b+Jdk1VUGNSVNef89KLbWLdy4XhhEry4S2S0AhRg=";
|
||||
|
|
|
|||
|
|
@ -21,11 +21,6 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ];
|
||||
# upstream currently doesn't work with the version of the macOS SDK
|
||||
# we're building against in nix-darwin without a patch.
|
||||
# this patch has been submitted upstream at https://github.com/prometheus/node_exporter/pull/2327
|
||||
# and only needs to be carried until it lands in a new release.
|
||||
patches = lib.optionals stdenv.isDarwin [ ./node-exporter/node-exporter-darwin.patch ];
|
||||
|
||||
excludedPackages = [ "docs/node-mixin" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go
|
||||
index a070f64..01d7f18 100644
|
||||
--- a/collector/powersupplyclass_darwin.go
|
||||
+++ b/collector/powersupplyclass_darwin.go
|
||||
@@ -18,9 +18,11 @@ package collector
|
||||
|
||||
/*
|
||||
#cgo LDFLAGS: -framework IOKit -framework CoreFoundation
|
||||
+#include <CoreFoundation/CFNumber.h>
|
||||
+#include <CoreFoundation/CFRunLoop.h>
|
||||
+#include <CoreFoundation/CFString.h>
|
||||
#include <IOKit/ps/IOPowerSources.h>
|
||||
#include <IOKit/ps/IOPSKeys.h>
|
||||
-#include <CoreFoundation/CFArray.h>
|
||||
|
||||
// values collected from IOKit Power Source APIs
|
||||
// Functions documentation available at
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "HyFetch";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "hyfetch";
|
||||
owner = "hykilpikonna";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-5TzIhbyrhQmuxR/Vs3XpOj/8FnykmBiDj6sXfFZK0uM=";
|
||||
sha256 = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,10 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoBuildFlags = [ "--bin" "xprite-native" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
# error[E0034]: multiple applicable items in scope
|
||||
# multiple `clamp` found
|
||||
# https://github.com/NixOS/nixpkgs/issues/146949
|
||||
broken = true;
|
||||
homepage = "https://github.com/rickyhan/xprite-editor";
|
||||
description = "Pixel art editor";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -21078,6 +21078,8 @@ with pkgs;
|
|||
|
||||
luabind_luajit = luabind.override { lua = luajit; };
|
||||
|
||||
luabridge = callPackage ../development/libraries/luabridge { };
|
||||
|
||||
luksmeta = callPackage ../development/libraries/luksmeta {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
|
|
@ -23712,6 +23714,8 @@ with pkgs;
|
|||
|
||||
memcached = callPackage ../servers/memcached {};
|
||||
|
||||
merecat = callPackage ../servers/http/merecat { };
|
||||
|
||||
meteor = callPackage ../servers/meteor { };
|
||||
|
||||
micronaut = callPackage ../development/tools/micronaut {};
|
||||
|
|
|
|||
|
|
@ -5706,6 +5706,8 @@ self: super: with self; {
|
|||
|
||||
mitmproxy = callPackage ../development/python-modules/mitmproxy { };
|
||||
|
||||
mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { };
|
||||
|
||||
mitogen = callPackage ../development/python-modules/mitogen { };
|
||||
|
||||
mixpanel = callPackage ../development/python-modules/mixpanel { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue