Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
55b5b71fba
|
|
@ -13577,6 +13577,12 @@
|
|||
githubId = 16734772;
|
||||
name = "Sumner Evans";
|
||||
};
|
||||
suominen = {
|
||||
email = "kimmo@suominen.com";
|
||||
github = "suominen";
|
||||
githubId = 1939855;
|
||||
name = "Kimmo Suominen";
|
||||
};
|
||||
superbo = {
|
||||
email = "supernbo@gmail.com";
|
||||
github = "SuperBo";
|
||||
|
|
|
|||
|
|
@ -102,9 +102,17 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;
|
||||
environment.variables = {
|
||||
QT_QPA_PLATFORMTHEME = cfg.platformTheme;
|
||||
QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;
|
||||
};
|
||||
|
||||
environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style;
|
||||
environment.profileRelativeSessionVariables = let
|
||||
qtVersions = with pkgs; [ qt5 qt6 ];
|
||||
in {
|
||||
QT_PLUGIN_PATH = map (qt: "/${qt.qtbase.qtPluginPrefix}") qtVersions;
|
||||
QML2_IMPORT_PATH = map (qt: "/${qt.qtbase.qtQmlPrefix}") qtVersions;
|
||||
};
|
||||
|
||||
environment.systemPackages = packages;
|
||||
|
||||
|
|
|
|||
|
|
@ -559,6 +559,7 @@
|
|||
./services/matrix/mautrix-facebook.nix
|
||||
./services/matrix/mautrix-telegram.nix
|
||||
./services/matrix/mjolnir.nix
|
||||
./services/matrix/mx-puppet-discord.nix
|
||||
./services/matrix/pantalaimon.nix
|
||||
./services/matrix/synapse.nix
|
||||
./services/misc/airsonic.nix
|
||||
|
|
@ -626,7 +627,6 @@
|
|||
./services/misc/mediatomb.nix
|
||||
./services/misc/metabase.nix
|
||||
./services/misc/moonraker.nix
|
||||
./services/misc/mx-puppet-discord.nix
|
||||
./services/misc/n8n.nix
|
||||
./services/misc/nitter.nix
|
||||
./services/misc/nix-daemon.nix
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ in
|
|||
description = "Take snapper snapshot of root on boot";
|
||||
inherit documentation;
|
||||
serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot";
|
||||
serviceConfig.type = "oneshot";
|
||||
serviceConfig.Type = "oneshot";
|
||||
requires = [ "local-fs.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.ConditionPathExists = "/etc/snapper/configs/root";
|
||||
|
|
|
|||
|
|
@ -389,6 +389,7 @@ in {
|
|||
memcached = handleTest ./memcached.nix {};
|
||||
merecat = handleTest ./merecat.nix {};
|
||||
metabase = handleTest ./metabase.nix {};
|
||||
mindustry = handleTest ./mindustry.nix {};
|
||||
minecraft = handleTest ./minecraft.nix {};
|
||||
minecraft-server = handleTest ./minecraft-server.nix {};
|
||||
minidlna = handleTest ./minidlna.nix {};
|
||||
|
|
|
|||
28
nixos/tests/mindustry.nix
Normal file
28
nixos/tests/mindustry.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "mindustry";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
environment.systemPackages = [ pkgs.mindustry ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.wait_for_x()
|
||||
machine.execute("mindustry >&2 &")
|
||||
machine.wait_for_window("Mindustry")
|
||||
# Loading can take a while. Avoid wasting cycles on OCR during that time
|
||||
machine.sleep(60)
|
||||
machine.wait_for_text(r"(Play|Database|Editor|Mods|Settings|Quit)")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }:
|
||||
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch, fdk_aac }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fdkaac";
|
||||
|
|
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# To be removed when 1.0.4 is released, see https://github.com/nu774/fdkaac/issues/54
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-37781.patch";
|
||||
url = "https://github.com/nu774/fdkaac/commit/ecddb7d63306e01d137d65bbbe7b78c1e779943c.patch";
|
||||
sha256 = "sha256-uZPf5tqBmF7VWp1fJcjp5pbYGRfzqgPZpBHpkdWYkV0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ fdk_aac ];
|
||||
|
|
|
|||
29
pkgs/applications/misc/lukesmithxyz-bible/kjv.nix
Normal file
29
pkgs/applications/misc/lukesmithxyz-bible/kjv.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, gawk
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lukesmithxyz-bible-kjv";
|
||||
version = "unstable-2022-06-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukesmithxyz";
|
||||
repo = "kjv";
|
||||
rev = "1b675c0396806a2a3d134c51fd11d9fed8ea3dc5";
|
||||
hash = "sha256-ii5SGZmO99VYbKdebfEbN3rL7LLSSQ0jm5mGqX2G3o0=";
|
||||
};
|
||||
|
||||
buildInputs = [ gawk ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Read the Word of God from your terminal + Apocrypha";
|
||||
homepage = "https://lukesmith.xyz/articles/command-line-bibles";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.wesleyjrz ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "108.0.1-1",
|
||||
"packageVersion": "108.0.2-1",
|
||||
"source": {
|
||||
"rev": "108.0.1-1",
|
||||
"sha256": "0ix8ri2s8rnpd9nqvwlk50x9hp51y70gb3r6f7lh4ldg2bay08n0"
|
||||
"rev": "108.0.2-1",
|
||||
"sha256": "0mzar03yq8vphhxhjzr2n4v9jm8z5j5vaxfzby7wf42pw7p0fml6"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "108.0.1",
|
||||
"sha512": "e6219ed6324422ec293ed96868738e056582bb9f7fb82e59362541f3465c6ebca806d26ecd801156b074c3675bd5a22507b1f1fa53eebf82b7dd35f2b1ff0625"
|
||||
"version": "108.0.2",
|
||||
"sha512": "f856ef034fa4a526e19968aed092c9ee99e124d2d271ec1c1bbd091d9a03e23293d69c7a9ae17c43258cde7e73c294534b471e36441e576377854f607c9bfa3a"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
26
pkgs/applications/networking/cluster/tubekit/default.nix
Normal file
26
pkgs/applications/networking/cluster/tubekit/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tubekit";
|
||||
version = "4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reconquest";
|
||||
repo = "tubekit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sq91uR8ITMOv8hivwKQR02mMlJpjDHw6RxiwVUrpwnY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qrGzmr1dZPn5r2WBJA7FT7RTqP2sxnrXgbrnKlnpF0Y=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kubectl alternative with quick context switching";
|
||||
homepage = "https://github.com/reconquest/tubekit";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ farcaller ];
|
||||
};
|
||||
}
|
||||
17
pkgs/applications/networking/cluster/tubekit/wrapper.nix
Normal file
17
pkgs/applications/networking/cluster/tubekit/wrapper.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, tubekit-unwrapped
|
||||
, pname ? "tubekit"
|
||||
, version ? tubekit-unwrapped.version
|
||||
, kubectl
|
||||
}:
|
||||
runCommand "${pname}-${version}"
|
||||
{
|
||||
inherit pname version;
|
||||
inherit (tubekit-unwrapped) src meta;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${tubekit-unwrapped}/bin/tubectl $out/bin/tubectl --set-default TUBEKIT_KUBECTL ${kubectl}/bin/kubectl
|
||||
''
|
||||
|
|
@ -33,13 +33,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nheko";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nheko-Reborn";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4Xe3eRnDkgyYB+hUP8TBWTt+m29HVtgcqVEQUUsIpCY=";
|
||||
hash = "sha256-2sN5lVjJ/CPH9U6NfZkAYZUTT+YDgPOy9dTVGp0svkg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.39";
|
||||
version = "3.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-mbeTdrKptPaMw1OA3jFftjJPOmUnJcjbv81yDSlFeaU=";
|
||||
hash = "sha256-eU1RnLjPSAdtv+EqVnIpOLsDfBjx4WHFnHHkGZfr130=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI=";
|
||||
vendorHash = "sha256-tKq5QEd7f4q7q2EDNjNrlatQ7+lXF9ya9L0iTP/AXSo=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/src/services/log.js b/src/services/log.js
|
||||
index 0fcd9812..dcbff070 100644
|
||||
index a141eae14..094b9381b 100644
|
||||
--- a/src/services/log.js
|
||||
+++ b/src/services/log.js
|
||||
@@ -1,15 +1,7 @@
|
||||
|
|
@ -35,7 +35,7 @@ index 0fcd9812..dcbff070 100644
|
|||
-function initLogFile() {
|
||||
- todaysMidnight = getTodaysMidnight();
|
||||
-
|
||||
- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log';
|
||||
- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`;
|
||||
-
|
||||
- if (logFile) {
|
||||
- logFile.end();
|
||||
|
|
@ -65,8 +65,8 @@ index 0fcd9812..dcbff070 100644
|
|||
-
|
||||
- millisSinceMidnight = checkDate(millisSinceMidnight);
|
||||
-
|
||||
- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE);
|
||||
- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`);
|
||||
-
|
||||
console.log(str);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -10,13 +10,13 @@ let
|
|||
maintainers = with maintainers; [ fliegendewurst ];
|
||||
};
|
||||
|
||||
version = "0.57.5";
|
||||
version = "0.58.5";
|
||||
|
||||
desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
desktopSource.sha256 = "0zm16g30bz9xm2z1x7w7knm352hpb8n301gcr8kwab79qrhszwl2";
|
||||
desktopSource.sha256 = "1mkn9wflmgazgyg26wkmfskmawgcf9sfk7y46msivwrj2gjwaban";
|
||||
|
||||
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
serverSource.sha256 = "0l53kps7rhf8rx9zx29psvjl3611y7pymfkh2yb13h6iv1c77gdf";
|
||||
serverSource.sha256 = "1h3qkpcl0vdz8vvn4h01b1w84v1ckinkdmyvm8312313fcvmyjzs";
|
||||
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "15.7.2",
|
||||
"repo_hash": "sha256-XfGQkbJs9AyU+aljfcE1Di8d9zQ6CoTo9I1INE2+4/U=",
|
||||
"version": "15.7.3",
|
||||
"repo_hash": "sha256-uB9LC5S/zxb8fwwvLjKRkZ1DOVKLnjYKAE2LeHXdP5E=",
|
||||
"yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.7.2-ee",
|
||||
"rev": "v15.7.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.7.2",
|
||||
"GITLAB_PAGES_VERSION": "15.7.2",
|
||||
"GITALY_SERVER_VERSION": "15.7.3",
|
||||
"GITLAB_PAGES_VERSION": "15.7.3",
|
||||
"GITLAB_SHELL_VERSION": "14.14.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.7.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.7.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.7.2";
|
||||
version = "15.7.3";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IROyq3YVMFzykWluGl3et3hf7L0IfhGrn3zLR1j1hto=";
|
||||
sha256 = "sha256-AcEjwq5dcNsPc3wQJNU1oiGAAqWIFNk8868Xw5ZC/g8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.7.2";
|
||||
version = "15.7.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "43.1";
|
||||
version = "43.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "DaEAPAzaCKwFRqTBQ+06FpfjaCPGD6c/TS9Np3I7zK8=";
|
||||
sha256 = "qGqap6RVURsCnOSaHYtGWcPDVbXYHXNgu00N5jev7eA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowebostv";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-W9RexBXo0yZStyFEAf7z5ki8tTHkc2RLD3wkX6nQsCE=";
|
||||
hash = "sha256-MCAnJth08CcmJKgOyzHmIuCKuGX814qOA4FSsukIsQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -33,6 +33,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module to interact with LG webOS based TV devices";
|
||||
homepage = "https://github.com/home-assistant-libs/aiowebostv";
|
||||
changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-audit-log";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qr5VQ2ceT4qcekwOPqmoe6K6K5b5/61vqgIgmQDh8wg=";
|
||||
hash = "sha256-huL6ujODrcj9BKW9f9T5YLPkrtqn7ZUPL4kc4WkC62s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ googleapis-common-protos protobuf ];
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.7.3";
|
||||
version = "2.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rH2aIst5XHEq93FXxlfDreROIWnM8pmq2UOOg9T2kjU=";
|
||||
hash = "sha256-gEgTYUsaac9dJIxCZJU/axjwiNqttUQiL6UskhzjsJg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-trace";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dKywvDNcvDOULHREKcHWIBVVBBzrttICX+VgcborJVI=";
|
||||
hash = "sha256-zqd9uiSpp6z5LyGG42axl6pGcYKmSrbku+UcLGtoUbI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
|
@ -11,9 +11,11 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4kVroM+y7luhQSFFDo2CWzxKFGH8oHYSIKq2bUERy7c=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "osvenskan";
|
||||
repo = "posix_ipc";
|
||||
rev = "rel${version}";
|
||||
hash = "sha256-xK5CkThqVFVMIxBtgUfHIRNRfmBxKa/DWBYQg7QHl/M=";
|
||||
};
|
||||
|
||||
pythonImportsCheckHook = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmb";
|
||||
version = "1.2.9";
|
||||
version = "1.2.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "miketeo";
|
||||
repo = "pysmb";
|
||||
rev = "refs/tags/pysmb-${version}";
|
||||
hash = "sha256-2AZAtypotSVXWfwokUpfWYQMiMq6EgbdBx2G7bU0Cqw=";
|
||||
hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.3.20221209165047";
|
||||
version = "8.3.20230109181936";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2XzJpNfEJV64AAvOuqisDR0xgBySH9QROrMFHB4ybHw=";
|
||||
hash = "sha256-4PuPvnk92kITPzdGQr6fGvFlG7+zyjfjQdiGbWld5Fo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h32G6skJ2vWay2iwoqkvBFlzafwHVilYKHVtZES3RvE=";
|
||||
hash = "sha256-tEeAr1QSec1Sayfg2/erk5u6wBZDodZIMYq9MaU7ATA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Hjr/SZK9dVID+VP7KFZkFmJn+te7cmI2ARu2l7wTzLg=";
|
||||
vendorHash = "sha256-FCAxqyacDdt3mR628/sguvrBx+nG10648XqF5hA8z+s=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.29.1";
|
||||
version = "1.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RumRA3uCerWDgWZfLVJhqhaxsZs2YYpINaCjgJDmQBo=";
|
||||
sha256 = "sha256-ZWM8VZifgVvCpjdOXKLHpN8jgFFqi5S9BklV5R2M9BU=";
|
||||
};
|
||||
cargoSha256 = "sha256-xKCslS98RB4yjt4v74dW8kSpHNGet0I4YhcA4mLLNwI=";
|
||||
cargoSha256 = "sha256-qlNCbLeDoZ+oweEKIZf66Tq+62mKodliXHp9QtC+b58=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
, libpulseaudio ? null
|
||||
, libjack2 ? null
|
||||
|
||||
, nixosTests
|
||||
|
||||
|
||||
# Make the build version easily overridable.
|
||||
# Server and client build versions must match, and an empty build version means
|
||||
|
|
@ -39,35 +41,35 @@ let
|
|||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U=";
|
||||
hash = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM=";
|
||||
hash = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "soloud";
|
||||
# This is pinned in Arc's arc-core/build.gradle
|
||||
rev = "v0.9";
|
||||
sha256 = "6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
|
||||
hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc=";
|
||||
};
|
||||
freetypeSource = fetchurl {
|
||||
# This is pinned in Arc's extensions/freetype/build.gradle
|
||||
url = "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz";
|
||||
sha256 = "1b4dcngjcly9n80hnyr4d5s6qp8bspabfs7v3h07gb13pdg7kasy";
|
||||
hash = "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw=";
|
||||
};
|
||||
glewSource = fetchurl {
|
||||
# This is pinned in Arc's backends/backend-sdl/build.gradle
|
||||
url = "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.zip";
|
||||
sha256 = "1m702jzfjhdr76cb71qplv6amhw15nnb1h6wbq4mlfbl6y8nl159";
|
||||
hash = "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ=";
|
||||
};
|
||||
SDLmingwSource = fetchurl {
|
||||
# This is pinned in Arc's backends/backend-sdl/build.gradle
|
||||
url = "https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz";
|
||||
sha256 = "1lbbjxl3a8vdillvv7654m6mp34lfkncvig5a8iwdmjpm214s29q";
|
||||
hash = "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -123,7 +125,6 @@ let
|
|||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
||||
| sh
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-Eb+LyO1d2XwhAp9awgMlxs7dfZav0ja9kH7PaUJQOCo=";
|
||||
};
|
||||
|
|
@ -215,6 +216,10 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
nixosTest = nixosTests.mindustry;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mindustrygame.github.io/";
|
||||
downloadPage = "https://github.com/Anuken/Mindustry/releases";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tetrio-plus";
|
||||
version = "0.23.13";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/a9647feffc484304ee49c4d3fd4ce718/tetrio-plus_0.23.13_app.asar.zip";
|
||||
sha256 = "sha256-NSOVZjm4hDXH3f0gFG8ijLmdUTyMRFYGhxpwysoYIVg=";
|
||||
url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/5c720489d2bcd35629b4f8a1f36d28b1/tetrio-plus_0.25.2_app.asar.zip";
|
||||
sha256 = "sha256-8Xc2wftRYIMZ2ee67IJEIGGrAAS02CL0XzDqQ/luYVE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "komga";
|
||||
version = "0.157.5";
|
||||
version = "0.158.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
|
||||
sha256 = "sha256-cgS8QxxNdE7KMlgb4EJtqpsRUBUFCH+F7Wh0Dh4Gg5Q=";
|
||||
sha256 = "sha256-WySZFoi1ifSuvlKrbgvd0WXzib6cSiOcGZ2cSSIQZTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.11.0";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CKlmHOaBQZbaRc0kYacaVFhpG11CTA9Q1JPZCwDZjn0=";
|
||||
sha256 = "sha256-px4rpVTOuQh7QuqqxiVqmB+iYrUdk82TE7MJSaGZLYw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rNqZ49XbkS2c8XeSQg8igc5zM+NqWMb6dGsh4dakamI=";
|
||||
vendorHash = "sha256-D8nFoTggxYNj7ZSY1rvA4YSJHbB7wwpPSu1g+S3c1C0=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monetdb";
|
||||
version = "11.45.7";
|
||||
version = "11.45.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
|
||||
sha256 = "sha256-hIfi8YfZIExgv+z3YAxvkX8MiiGmOjB+/OryUoRPmDI=";
|
||||
sha256 = "sha256-0Hme9ohyRuiN9CAZq7SAWGcQxNakiDVWEoL+wt1GsfY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xnotify";
|
||||
version = "unstable-2022-02-18";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phillbush";
|
||||
|
|
|
|||
47
pkgs/tools/misc/colorless/default.nix
Normal file
47
pkgs/tools/misc/colorless/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, stdenvNoCC
|
||||
, coreutils
|
||||
, bash
|
||||
, binSh ? "${bash}/bin/bash"
|
||||
, gnused
|
||||
, less
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "colorless";
|
||||
version = "109";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://software.kimmo.suominen.com/${pname}-${version}.tar.gz";
|
||||
sha256 = "039a140fa11cf153cc4d03e4f753b7ff142cab88ff116b7600ccf9edee81927c";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"TOOLPATH=${lib.makeBinPath [ coreutils gnused less ]}"
|
||||
"PREFIX=$(out)"
|
||||
"SHELL=${binSh}"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/share/doc/colorless LICENSE README.md
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kimmo.suominen.com/sw/colorless";
|
||||
description = "Enable colorised command output and pipe it to less";
|
||||
longDescription = ''
|
||||
colorless is a wrapper that enables colorised output of commands and
|
||||
pipes the output to less(1).
|
||||
'';
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ suominen ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
stdenv, lib, fetchFromGitHub, which,
|
||||
buildPackages, libxcrypt,
|
||||
buildPackages, libxcrypt, libiconv, Libsystem,
|
||||
enableStatic ? stdenv.hostPlatform.isStatic,
|
||||
enableMinimal ? false,
|
||||
extraConfig ? ""
|
||||
|
|
@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
|
|||
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
|
||||
buildInputs = [
|
||||
libxcrypt
|
||||
] ++lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
Libsystem # This shouldn't be necessary, see https://github.com/NixOS/nixpkgs/issues/210923
|
||||
] ++lib.optionals (enableStatic && stdenv.cc.libc ? static) [
|
||||
stdenv.cc.libc
|
||||
stdenv.cc.libc.static
|
||||
|
|
@ -67,8 +70,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://landley.net/toybox/";
|
||||
license = licenses.bsd0;
|
||||
platforms = with platforms; linux ++ darwin ++ freebsd;
|
||||
# https://github.com/NixOS/nixpkgs/issues/101229
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ hhm ];
|
||||
priority = 10;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tlsx";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aT6CfoYm1giMJgWdUyLw/eT4vSI6k8OG6kjbYtu0lwI=";
|
||||
hash = "sha256-5roEaWdvjMYoQJqfMxRKryb9frDnpoJOYTG5g2MSIy0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fnBN3K1XMfrfp3l4syMFRCnzHvpX6CgUVo9qotrudaI=";
|
||||
vendorHash = "sha256-g7v7n8xwYOuE4ojOEjgNmbyytPuwbxQx1R6fXHpVrYU=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tor";
|
||||
version = "0.4.7.12";
|
||||
version = "0.4.7.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-O12WlxLEZ4Ub0CjzFDQ+8VqX6kVxkek/+pcxCwW545U=";
|
||||
sha256 = "sha256-IHkXLM4DRVbxEASOJgg86b6nUfMVSwrSgJdRgVsR6p0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "geoip" ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mark";
|
||||
version = "8.4";
|
||||
version = "8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovetskiy";
|
||||
repo = "mark";
|
||||
rev = version;
|
||||
sha256 = "sha256-b9oWuIdCVsbPJYaSDsvKI1rOvcH97aoeN748B89XxBQ=";
|
||||
sha256 = "sha256-2HcCibcP3/E3nu+PoNFChLFyCwAeAdp6I8mN95747Sg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-t2xiw1Z0BIT7pO4Z16XmsJE72RgL9Hobfy7LakpEYh4=";
|
||||
vendorHash = "sha256-t2xiw1Z0BIT7pO4Z16XmsJE72RgL9Hobfy7LakpEYh4=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1350,6 +1350,8 @@ with pkgs;
|
|||
|
||||
clematis = callPackage ../tools/misc/clematis { };
|
||||
|
||||
colorless = callPackage ../tools/misc/colorless { };
|
||||
|
||||
cope = callPackage ../tools/misc/cope { };
|
||||
|
||||
ejson2env = callPackage ../tools/admin/ejson2env { };
|
||||
|
|
@ -3352,6 +3354,8 @@ with pkgs;
|
|||
|
||||
kjv = callPackage ../applications/misc/kjv { };
|
||||
|
||||
lukesmithxyz-bible-kjv = callPackage ../applications/misc/lukesmithxyz-bible/kjv.nix { };
|
||||
|
||||
luigi = callPackage ../applications/networking/cluster/luigi { };
|
||||
|
||||
m-cli = callPackage ../os-specific/darwin/m-cli { };
|
||||
|
|
@ -12452,7 +12456,9 @@ with pkgs;
|
|||
|
||||
toxvpn = callPackage ../tools/networking/toxvpn { };
|
||||
|
||||
toybox = callPackage ../tools/misc/toybox { };
|
||||
toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox {
|
||||
inherit (darwin.apple_sdk_11_0) Libsystem;
|
||||
};
|
||||
|
||||
trackma = callPackage ../tools/misc/trackma { };
|
||||
|
||||
|
|
@ -38591,4 +38597,8 @@ with pkgs;
|
|||
jfrog-cli = callPackage ../tools/misc/jfrog-cli { };
|
||||
|
||||
ov = callPackage ../tools/text/ov { };
|
||||
|
||||
tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
|
||||
|
||||
tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue