Skip to content

Commit acc7ed9

Browse files
Merge master into staging-next
2 parents 46cbaad + 19951ca commit acc7ed9

54 files changed

Lines changed: 554 additions & 872 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

lib/licenses.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ in mkLicense lset) ({
109109
fullName = "Apache License 2.0";
110110
};
111111

112+
bitstreamVera = {
113+
spdxId = "Bitstream-Vera";
114+
fullName = "Bitstream Vera Font License";
115+
};
116+
112117
bola11 = {
113118
url = "https://blitiri.com.ar/p/bola/";
114119
fullName = "Buena Onda License Agreement 1.1";

nixos/modules/module-list.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@
319319
./services/backup/zfs-replication.nix
320320
./services/backup/znapzend.nix
321321
./services/blockchain/ethereum/geth.nix
322+
./services/blockchain/ethereum/erigon.nix
322323
./services/backup/zrepl.nix
323324
./services/cluster/corosync/default.nix
324325
./services/cluster/hadoop/default.nix
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{ config, lib, pkgs, ... }:
2+
3+
with lib;
4+
let
5+
6+
cfg = config.services.erigon;
7+
8+
settingsFormat = pkgs.formats.toml { };
9+
configFile = settingsFormat.generate "config.toml" cfg.settings;
10+
in {
11+
12+
options = {
13+
services.erigon = {
14+
enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier");
15+
16+
settings = mkOption {
17+
description = lib.mdDoc ''
18+
Configuration for Erigon
19+
Refer to <https://github.com/ledgerwatch/erigon#usage> for details on supported values.
20+
'';
21+
22+
type = settingsFormat.type;
23+
24+
example = {
25+
datadir = "/var/lib/erigon";
26+
chain = "mainnet";
27+
http = true;
28+
"http.port" = 8545;
29+
"http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"];
30+
ws = true;
31+
port = 30303;
32+
"authrpc.port" = 8551;
33+
"torrent.port" = 42069;
34+
"private.api.addr" = "localhost:9090";
35+
"log.console.verbosity" = 3; # info
36+
};
37+
38+
defaultText = literalExpression ''
39+
{
40+
datadir = "/var/lib/erigon";
41+
chain = "mainnet";
42+
http = true;
43+
"http.port" = 8545;
44+
"http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"];
45+
ws = true;
46+
port = 30303;
47+
"authrpc.port" = 8551;
48+
"torrent.port" = 42069;
49+
"private.api.addr" = "localhost:9090";
50+
"log.console.verbosity" = 3; # info
51+
}
52+
'';
53+
};
54+
};
55+
};
56+
57+
config = mkIf cfg.enable {
58+
# Default values are the same as in the binary, they are just written here for convenience.
59+
services.erigon.settings = {
60+
datadir = mkDefault "/var/lib/erigon";
61+
chain = mkDefault "mainnet";
62+
http = mkDefault true;
63+
"http.port" = mkDefault 8545;
64+
"http.api" = mkDefault ["eth" "debug" "net" "trace" "web3" "erigon"];
65+
ws = mkDefault true;
66+
port = mkDefault 30303;
67+
"authrpc.port" = mkDefault 8551;
68+
"torrent.port" = mkDefault 42069;
69+
"private.api.addr" = mkDefault "localhost:9090";
70+
"log.console.verbosity" = mkDefault 3; # info
71+
};
72+
73+
systemd.services.erigon = {
74+
description = "Erigon ethereum implemenntation";
75+
wantedBy = [ "multi-user.target" ];
76+
after = [ "network.target" ];
77+
78+
serviceConfig = {
79+
ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile}";
80+
Restart = "on-failure";
81+
StateDirectory = "erigon";
82+
CapabilityBoundingSet = "";
83+
DynamicUser = true;
84+
NoNewPrivileges = true;
85+
PrivateTmp = true;
86+
ProtectHome = true;
87+
ProtectClock = true;
88+
ProtectProc = "noaccess";
89+
ProcSubset = "pid";
90+
ProtectKernelLogs = true;
91+
ProtectKernelModules = true;
92+
ProtectKernelTunables = true;
93+
ProtectControlGroups = true;
94+
ProtectHostname = true;
95+
RestrictSUIDSGID = true;
96+
RestrictRealtime = true;
97+
RestrictNamespaces = true;
98+
LockPersonality = true;
99+
RemoveIPC = true;
100+
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
101+
SystemCallFilter = [ "@system-service" "~@privileged" ];
102+
};
103+
};
104+
};
105+
}

pkgs/applications/audio/ario/default.nix

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ lib
22
, stdenv
33
, fetchurl
4+
, autoreconfHook
45
, pkg-config
56
, intltool
67
, avahi
@@ -24,7 +25,14 @@ stdenv.mkDerivation rec {
2425
sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
2526
};
2627

27-
nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ];
28+
nativeBuildInputs = [
29+
autoreconfHook
30+
pkg-config
31+
gettext
32+
intltool
33+
wrapGAppsHook
34+
];
35+
2836
buildInputs = [
2937
avahi
3038
curl
@@ -36,6 +44,12 @@ stdenv.mkDerivation rec {
3644
taglib
3745
];
3846

47+
postInstall = lib.optionalString stdenv.isDarwin ''
48+
for file in $out/lib/ario/plugins/*.dylib; do
49+
ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so
50+
done
51+
'';
52+
3953
meta = with lib; {
4054
description = "GTK client for MPD (Music player daemon)";
4155
homepage = "http://ario-player.sourceforge.net/";

pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
stdenv.mkDerivation rec {
88
pname = "bitwig-studio";
9-
version = "4.4.1";
9+
version = "4.4.2";
1010

1111
src = fetchurl {
1212
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
13-
sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4=";
13+
sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w=";
1414
};
1515

1616
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

pkgs/applications/audio/grandorgue/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
stdenv.mkDerivation rec {
77
pname = "grandorgue";
8-
version = "3.8.0-1";
8+
version = "3.9.0-1";
99

1010
src = fetchFromGitHub {
1111
owner = "GrandOrgue";
1212
repo = pname;
1313
rev = version;
1414
fetchSubmodules = true;
15-
sha256 = "sha256-VXf2B5NK6lrcNXUiTTjYhfBVrTWusyadD+5ySkmelsI=";
15+
sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU=";
1616
};
1717

1818
postPatch = ''

pkgs/applications/blockchains/alfis/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
rustPlatform.buildRustPackage rec {
1616
pname = "alfis";
17-
version = "0.8.2";
17+
version = "0.8.3";
1818

1919
src = fetchFromGitHub {
2020
owner = "Revertron";
2121
repo = "Alfis";
2222
rev = "v${version}";
23-
sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84=";
23+
sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ=";
2424
};
2525

26-
cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI=";
26+
cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ=";
2727

2828
checkFlags = [
2929
# these want internet access, disable them

pkgs/applications/editors/vscode/vscodium.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ let
1515
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
1616

1717
sha256 = {
18-
x86_64-linux = "0bc95mdl19la63yvqrpfcvq9sx68wfv60a3xrz2z5lk308khfpr6";
19-
x86_64-darwin = "0qb8610ilf69j0zl7z031bmqdsxsj15w1maz7lx0z09yrdyvgi7c";
20-
aarch64-linux = "157arn7wsxgh3qr4bzhy75y7zw9qwz1zch7ny36kr53135d2nhz6";
21-
aarch64-darwin = "0dwzqv1j1gcjyc1w41f9k1pijazr62r569arh4l53xi7amrp7hx8";
22-
armv7l-linux = "1lam1z8hqdav4al07d1ahq4qh2npv191n2gqpdxg5b1fs7zv3k85";
18+
x86_64-linux = "1jp21lnz3vmv4f6crnqbkj6jzr6wl5h2ibniki7azamaqxy51ipi";
19+
x86_64-darwin = "1msngvngcfhc3zmi2vfg5bgrhmj9ml4pyd9lpr7dpcxycswvifw7";
20+
aarch64-linux = "17l4w4vvvninyhyiwkkqhz7nhm68wj7diwwn9sh54x71dmwcqlcs";
21+
aarch64-darwin = "102vciba35sma1810bvnr5xa9qaf0fbvrg8blqchy77gydcrnj8b";
22+
armv7l-linux = "0ihbqy5wda1326nhqgckz26icr9inwk1pvspvpmg221y279s3iwp";
2323
}.${system} or throwSystem;
2424

2525
sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
2929

3030
# Please backport all compatible updates to the stable release.
3131
# This is important for the extension ecosystem.
32-
version = "1.72.2.22289";
32+
version = "1.73.0.22306";
3333
pname = "vscodium";
3434

3535
executableName = "codium";

pkgs/applications/kde/akonadi/default.nix

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
mkDerivation, lib, kdepimTeam,
33
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
44
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
5-
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
6-
signond, xz,
5+
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb,
6+
postgresql, qttools, signond, xz,
7+
8+
mysqlSupport ? true,
9+
postgresSupport ? false,
10+
defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES",
711
}:
812

13+
assert mysqlSupport || postgresSupport;
14+
915
mkDerivation {
1016
pname = "akonadi";
1117
meta = {
@@ -26,17 +32,19 @@ mkDerivation {
2632
propagatedBuildInputs = [ boost kitemmodels ];
2733
outputs = [ "out" "dev" ];
2834
CXXFLAGS = [
29-
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"''
30-
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"''
31-
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"''
32-
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"''
33-
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
34-
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
35-
''-DNIXPKGS_POSTGRES_INITDB=\"\"''
35+
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"''
36+
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"''
37+
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"''
38+
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"''
39+
''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"''
40+
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"''
41+
''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"''
3642
''-DNIX_OUT=\"${placeholder "out"}\"''
3743
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
3844
];
3945

46+
cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
47+
4048
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
4149
postInstall = ''
4250
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection

pkgs/applications/networking/browsers/chromium/upstream-info.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
}
2020
},
2121
"beta": {
22-
"version": "108.0.5359.22",
23-
"sha256": "1wwrwqyl9nl4kpkmkybw14ygj5lfrk274yx5f817ha1kpk8vma0y",
24-
"sha256bin64": "0dq3mf1rai7i3aqq9h8g4iy9nxy3hbb6gd86c31admxygdpgpds5",
22+
"version": "108.0.5359.30",
23+
"sha256": "1sxvlmz9k6r3qmlpljlis3p7vac26k62w21n8x29733hsq3hdra7",
24+
"sha256bin64": "03x79s394xzwncfcgc4lw825q15i1ww2kmy2y7lcld9h52qyns8q",
2525
"deps": {
2626
"gn": {
2727
"version": "2022-10-05",
@@ -32,15 +32,15 @@
3232
}
3333
},
3434
"dev": {
35-
"version": "109.0.5384.0",
36-
"sha256": "195lbklp5c6bvfzhdvah4k2yr44jwy64499y37kgxky0mb79a26n",
37-
"sha256bin64": "02qbwj9gfcgxdqm1mhxg0mljvrhnl994lhis615y23099r3r67i8",
35+
"version": "109.0.5396.2",
36+
"sha256": "0a4pd365i8wj608n9d6624mf11491px1x0wv4673m3nkj1k8sqld",
37+
"sha256bin64": "1gk7wi20h11bwsfch67xazjk9grxj6ax6vjyz7ihrlajdahdaf0w",
3838
"deps": {
3939
"gn": {
40-
"version": "2022-10-26",
40+
"version": "2022-10-28",
4141
"url": "https://gn.googlesource.com/gn",
42-
"rev": "3e98c606ed0dff59fa461fbba4892c0b6de1966e",
43-
"sha256": "08cz58svkb7c71f1x1ahr60a6ircr31rfmkk4d46z2v39sgry1gv"
42+
"rev": "a4d67be044b42963de801001e7146f9657c7fad4",
43+
"sha256": "0wikkkx503ip5xr72bz6d6sh2k50h5wlz9y8vmasvnrz9kjmlv5b"
4444
}
4545
}
4646
},

0 commit comments

Comments
 (0)