nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-08-02 00:14:09 +00:00
committed by GitHub
parent 8b65c3d2a0 102f594033
commit 689be36bd6
28 changed files with 859 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View File

@@ -1635,7 +1635,7 @@ in {
"gitlab-config.service"
"gitlab-db-config.service"
] ++ optional (cfg.databaseHost == "") "postgresql.service";
wantedBy = [ "gitlab.target" ];
requiredBy = [ "gitlab.target" ];
partOf = [ "gitlab.target" ];
environment = gitlabEnv;
path = with pkgs; [

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-14";
version = "7.1.1-15";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-vZ3ILHIRxwB3ho7hlJpC7hlo7Nhb56SjZ/hgdoh1rwY=";
hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

7
pkgs/applications/misc/organicmaps/default.nix
View File

@@ -21,13 +21,13 @@
mkDerivation rec {
pname = "organicmaps";
version = "2023.05.08-7";
version = "2023.06.04-13";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
sha256 = "sha256-V7qTi5NiZf+1voZSHfuAyfMeTeiYfs/CoOQ2zweKmaU=";
hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc=";
fetchSubmodules = true;
};
@@ -37,6 +37,9 @@ mkDerivation rec {
# crude fix for https://github.com/organicmaps/organicmaps/issues/1862
echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh
# TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345
patchShebangs 3party/boost/tools/build/src/engine/build.sh
'';
nativeBuildInputs = [

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "115.0.2";
version = "116.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b";
sha512 = "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d";
};
meta = {
@@ -87,11 +87,11 @@
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.13.0esr";
version = "102.14.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde";
sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd";
};
meta = {
@@ -115,11 +115,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.0.3esr";
version = "115.1.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376";
sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592";
};
meta = {

59
pkgs/development/python-modules/coredis/default.nix Normal file
View File

@@ -0,0 +1,59 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, async-timeout
, deprecated
, pympler
, wrapt
, pytestCheckHook
, redis
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "coredis";
version = "4.14.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "alisaifee";
repo = pname;
rev = version;
hash = "sha256-pHCQ5dePk2VhYNf/Ka+sovIn2OAVYHnLQhPFVjKmgb4=";
};
postPatch = ''
substituteInPlace pytest.ini --replace "-K" ""
'';
propagatedBuildInputs = [
async-timeout
deprecated
pympler
wrapt
];
pythonImportsCheck = [ "coredis" ];
nativeCheckInputs = [
pytestCheckHook
redis
pytest-asyncio
];
# all other tests require docker
pytestFlagsArray = [
"tests/test_lru_cache.py"
"tests/test_parsers.py"
"tests/test_retry.py"
"tests/test_utils.py"
];
meta = with lib; {
changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst";
homepage = "https://github.com/alisaifee/coredis";
description = "An async redis client with support for redis server, cluster & sentinel";
license = licenses.mit;
maintainers = with maintainers; [ netali ];
};
}

34
pkgs/development/python-modules/py-radix-sr/default.nix Normal file
View File

@@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "py-radix-sr";
version = "1.0.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "SEKOIA-IO";
repo = "py-radix";
rev = "v${version}";
hash = "sha256-aHV+NvPR4Gyk6bEpCftgBylis9rU7BWLpBMatjP4QmE=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "name='py-radix'" "name='py-radix-sr'"
'';
pythonImportsCheck = [ "radix" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Python radix tree for IPv4 and IPv6 prefix matching";
homepage = "https://github.com/SEKOIA-IO/py-radix";
license = with licenses; [ isc bsdOriginal ];
maintainers = with maintainers; [ netali ];
};
}

50
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -22,51 +22,51 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.187-hardened1.patch",
"sha256": "17m8v9xs300cd4jblvqxgmpsi0i15r57sl8xfc0vnl3b0ikip1rk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.187-hardened1/linux-hardened-5.10.187-hardened1.patch"
"name": "linux-hardened-5.10.188-hardened1.patch",
"sha256": "10mnrnzg3b5iirvn9x241zxwlysrnv7i65hiil2h8f7lswwgb6ar",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.188-hardened1/linux-hardened-5.10.188-hardened1.patch"
},
"sha256": "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n",
"version": "5.10.187"
"sha256": "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9",
"version": "5.10.188"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.122-hardened1.patch",
"sha256": "0845jjvs2wf81vp43f62gsbkdi1l96ajpv6n7pnc1bi02hqgb6az",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.122-hardened1/linux-hardened-5.15.122-hardened1.patch"
"name": "linux-hardened-5.15.123-hardened1.patch",
"sha256": "0q942jcz22yq7lbhmbwpg12p75zb0ky36zp2waz30cixw7lmyx6b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.123-hardened1/linux-hardened-5.15.123-hardened1.patch"
},
"sha256": "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q",
"version": "5.15.122"
"sha256": "14xzk4rn7fwgdysnd763rbl25krvq40wk3y5cf8hasifl529brid",
"version": "5.15.123"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.250-hardened1.patch",
"sha256": "0l4a0wwv2ipwic24igvy48b114p55bx6zjbsj8j1jja6xpn8psk5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.250-hardened1/linux-hardened-5.4.250-hardened1.patch"
"name": "linux-hardened-5.4.251-hardened1.patch",
"sha256": "148qyspyj4a6yrl45f358z64iqxf40zb71ccj5kvwbrn395xiwgs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.251-hardened1/linux-hardened-5.4.251-hardened1.patch"
},
"sha256": "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg",
"version": "5.4.250"
"sha256": "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w",
"version": "5.4.251"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.41-hardened1.patch",
"sha256": "084lwlynwsm76vnmp02q80vbv4bi993swz3vvwsj3na8160c1w2y",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.41-hardened1/linux-hardened-6.1.41-hardened1.patch"
"name": "linux-hardened-6.1.42-hardened1.patch",
"sha256": "0v5ja4q8wq3gwds0m8bzrxhx6vagg97lvcxrw3glm1d5sv1v94l6",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.42-hardened1/linux-hardened-6.1.42-hardened1.patch"
},
"sha256": "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i",
"version": "6.1.41"
"sha256": "1lqy72yvsbcv7an1gr8sam6ym3788ss811xb3sw7d2qwaldjdy5a",
"version": "6.1.42"
},
"6.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.4.6-hardened1.patch",
"sha256": "1364ilh3vfvajx2ahd1mkwv13lnbfzmg0cwa9apghqfzqdn1c77x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.6-hardened1/linux-hardened-6.4.6-hardened1.patch"
"name": "linux-hardened-6.4.7-hardened1.patch",
"sha256": "1kzkx0i3hkq25rywl8xsf5i8716ycjspblk1hrkaq6a02ci0697b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.7-hardened1/linux-hardened-6.4.7-hardened1.patch"
},
"sha256": "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71",
"version": "6.4.6"
"sha256": "1n57qijg0m27wcrqll8rb1hi1n0n8ca3bzsnbz05d9ya3nv3q56y",
"version": "6.4.7"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.187";
version = "5.10.188";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n";
sha256 = "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.122";
version = "5.15.123";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q";
sha256 = "14xzk4rn7fwgdysnd763rbl25krvq40wk3y5cf8hasifl529brid";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.250";
version = "5.4.251";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg";
sha256 = "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.41";
version = "6.1.42";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i";
sha256 = "1lqy72yvsbcv7an1gr8sam6ym3788ss811xb3sw7d2qwaldjdy5a";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.4.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.4.6";
version = "6.4.7";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71";
sha256 = "1n57qijg0m27wcrqll8rb1hi1n0n8ca3bzsnbz05d9ya3nv3q56y";
};
} // (args.argsOverride or { }))

6
pkgs/servers/matrix-synapse/default.nix
View File

@@ -12,20 +12,20 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.88.0";
version = "1.89.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
hash = "sha256-uNk+vyOCbaoy8Jw8W5KyedIw6bJ0ci8NkFTMlBVcxEw=";
hash = "sha256-ywDXjwYYCR0ojemRnShDmeoeUlDkpFH/ajFxV2DrR70=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-ILLZUQjUbLvmNsDpCSqKAYO/PRHTJ/XTDJTo/LCT/mg=";
hash = "sha256-Atwa7yIA9kPsle0/DKQD30PJljVNArqWgau4Ueqzo94=";
};
postPatch = ''

7
pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "matrix-appservice-slack",
"version": "2.1.1",
"version": "2.1.2",
"description": "A Matrix <--> Slack bridge",
"engines": {
"node": ">=16 <=18"
@@ -42,12 +42,13 @@
"axios": "^0.27.2",
"classnames": "^2.3.2",
"escape-string-regexp": "^4.0.0",
"matrix-appservice-bridge": "^8.1.1",
"https-proxy-agent": "^5.0.1",
"matrix-appservice-bridge": "^8.1.2",
"matrix-widget-api": "^1.1.1",
"minimist": "^1.2.6",
"nedb": "^1.8.0",
"node-emoji": "^1.10.0",
"nunjucks": "^3.2.3",
"nunjucks": "^3.2.4",
"p-queue": "^6.0.0",
"pg-promise": "^10.11.1",
"randomstring": "^1.2.1",

6
pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
View File

@@ -1,5 +1,5 @@
{
"version": "2.1.1",
"srcHash": "+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=",
"yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki"
"version": "2.1.2",
"srcHash": "e9k+5xvgHkVt/fKAr0XhYjbEzHYwdGRdqiPWWbT0T5M=",
"yarnHash": "0266rrfx0fnrhn64ivy4iygf6nl5vc5i08j6h72k2zrh3rg203kz"
}

159
pkgs/servers/misc/irrd/default.nix Normal file
View File

@@ -0,0 +1,159 @@
{ lib
, python3
, fetchPypi
, git
, postgresql
, postgresqlTestHook
, redis
}:
let
py = python3.override {
packageOverrides = final: prev: {
sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
doCheck = false;
});
starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec {
version = "0.20.4";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ=";
};
nativeBuildInputs = with final; [
setuptools
];
doCheck = false;
});
ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec {
version = "0.17.1";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8=";
};
nativeBuildInputs = with final; [
setuptools
];
doCheck = false;
});
alembic = prev.alembic.overridePythonAttrs (lib.const {
doCheck = false;
});
beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec {
version = "0.8.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-1E2VUbvte/qIZ1Mk+E77mqhXOE1E6fsh61MPCgutuBU=";
};
doCheck = false;
});
};
};
in
py.pkgs.buildPythonPackage rec {
pname = "irrd";
version = "4.3.0.post1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M=";
};
patches = [
./irrd-asgiref-3.8.0.diff
];
pythonRelaxDeps = true;
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
postPatch = ''
substituteInPlace setup.py --replace psycopg2-binary psycopg2
'';
nativeCheckInputs = [
git
redis
postgresql
postgresqlTestHook
] ++ (with py.pkgs; [
pytest-asyncio
pytest-freezegun
pytestCheckHook
]);
propagatedBuildInputs = with py.pkgs; [
python-gnupg
passlib
bcrypt
ipy
ordered-set
beautifultable
pyyaml
datrie
setproctitle
python-daemon
pid
py.pkgs.redis
hiredis
coredis
requests
pytz
ariadne
uvicorn
starlette
psutil
asgiref
pydantic
typing-extensions
py-radix-sr
psycopg2
sqlalchemy
alembic
ujson
wheel
websockets
] ++ py.pkgs.uvicorn.optional-dependencies.standard;
preCheck = ''
redis-server &
REDIS_PID=$!
while ! redis-cli --scan ; do
echo waiting for redis
sleep 1
done
export IRRD_DATABASE_URL="postgres:///$PGDATABASE"
export IRRD_REDIS_URL="redis://localhost/1"
'';
postCheck = ''
kill $REDIS_PID
'';
# skip tests that require internet access
disabledTests = [
"test_020_dash_o_noop"
"test_050_non_json_response"
];
meta = with lib; {
changelog = "https://irrd.readthedocs.io/en/v${version}/releases/";
description = "An Internet Routing Registry database server, processing IRR objects in the RPSL format";
license = licenses.mit;
homepage = "https://github.com/irrdnet/irrd";
maintainers = with maintainers; [ netali yuka ];
};
}

51
pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff Normal file
View File

@@ -0,0 +1,51 @@
diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py
index 65ddf5d..b3b385a 100644
--- a/irrd/server/graphql/schema_builder.py
+++ b/irrd/server/graphql/schema_builder.py
@@ -31,32 +31,32 @@ def build_executable_schema():
"""
schema = SchemaGenerator()
- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False))
- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False))
+ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False))
+ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False))
- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False))
- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False))
- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False))
- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False))
- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False))
+ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False))
+ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False))
+ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False))
+ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False))
+ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False))
- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False))
- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False))
+ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False))
+ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False))
for object_type in schema.object_types:
if "adminCObjs" in schema.graphql_types[object_type.name]:
- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False))
+ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False))
for object_type in schema.object_types:
if "techCObjs" in schema.graphql_types[object_type.name]:
- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False))
+ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False))
for object_type in schema.object_types:
if "mbrsByRefObjs" in schema.graphql_types[object_type.name]:
- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False))
+ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False))
for object_type in schema.object_types:
if "memberOfObjs" in schema.graphql_types[object_type.name]:
- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False))
+ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False))
for object_type in schema.object_types:
if "membersObjs" in schema.graphql_types[object_type.name]:
- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False))
+ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False))
@schema.asn_scalar_type.value_parser
def parse_asn_scalar(value):

8
pkgs/servers/monitoring/grafana/default.nix
View File

@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.5.6";
version = "9.5.7";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
hash = "sha256-7JNjV7KLxPSXgRn1Y1ds4VnGUSGFsf3l0RmmdAGDN5w=";
hash = "sha256-QrHg4B2+9XCMaW7l1AWClQMxbT0Rhbb++5ELL7kdqOw=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
hash = "sha256-pk1+k2qFAx2AY9yDCb/iUphyOeT0cDK0duokewCfygc=";
hash = "sha256-Bv2vbju3VKXJTTzjhXCzYgng8i1RnQyM73s+XcJAmp8=";
};
vendorHash = "sha256-E9Qdsk691+laPrQQnYBIwxAIbXh7wxB0G2e/Vp+4x98=";
vendorHash = "sha256-Fn+YDE7DAdgmRIfKMD8n9KYayqvKt5kUzY2K6tL/CqY=";
nativeBuildInputs = [ wire ];

111
pkgs/servers/web-apps/hedgedoc/default.nix
View File

@@ -1,76 +1,101 @@
{ lib
, stdenv
, fetchzip
, makeWrapper
, which
, fetchFromGitHub
, gitMinimal
, cacert
, yarn
, makeBinaryWrapper
, nodejs
, mkYarnPackage
, fetchYarnDeps
, python3
, nixosTests
}:
mkYarnPackage rec {
let
version = "1.9.9";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "hedgedoc";
rev = version;
hash = "sha256-6eKTgEZ+YLoSmPQWBS95fJ+ioIxeTVlT+moqslByPPw=";
};
# we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles
offlineCache = stdenv.mkDerivation {
name = "hedgedoc-${version}-offline-cache";
inherit src;
nativeBuildInputs = [
cacert # needed for git
gitMinimal # needed to download git dependencies
nodejs # needed for npm to download git dependencies
yarn
];
buildPhase = ''
export HOME=$(mktemp -d)
yarn config set enableTelemetry 0
yarn config set cacheFolder $out
yarn config set --json supportedArchitectures.os '[ "linux" ]'
yarn config set --json supportedArchitectures.cpu '["arm", "arm64", "ia32", "x64"]'
yarn
'';
outputHashMode = "recursive";
outputHash = "sha256-Ga+tl4oZlum43tdfez1oWGMHZAfyePGl47S+9NRRvW8=";
};
in stdenv.mkDerivation {
pname = "hedgedoc";
version = "1.9.7";
inherit version src;
# we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies
# in development and production and the web assets muts be compiled with js-yaml 3 while development
# uses js-yaml 4 which breaks the text editor
src = fetchzip {
url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz";
hash = "sha256-tPkhnnKDS5TICsW66YCOy7xWFj5usLyDMbYMYQ3Euoc=";
};
nativeBuildInputs = [
makeBinaryWrapper
yarn
python3 # needed for sqlite node-gyp
];
nativeBuildInputs = [ which makeWrapper ];
extraBuildInputs = [ python3 ];
packageJSON = ./package.json;
yarnFlags = [ "--production" ];
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "0qkc26ks33vy00jgpv4445wzgxx1mzi70pkm1l8y9amgd9wf9aig";
};
configurePhase = ''
cp -r "$node_modules" node_modules
chmod -R u+w node_modules
'';
dontConfigure = true;
buildPhase = ''
runHook preBuild
pushd node_modules/sqlite3
export HOME=$(mktemp -d)
yarn config set enableTelemetry 0
yarn config set cacheFolder ${offlineCache}
# This will fail but create the sqlite3 files we can patch
yarn --immutable-cache || :
# Ensure we don't download any node things
sed -i 's:--fallback-to-build:--build-from-source --nodedir=${nodejs}/include/node:g' node_modules/sqlite3/package.json
export CPPFLAGS="-I${nodejs}/include/node"
npm run install --build-from-source --nodedir=${nodejs}/include/node
popd
# Perform the actual install
yarn --immutable-cache
yarn run build
patchShebangs bin/*
runHook postBuild
'';
dontInstall = true;
distPhase = ''
runHook preDist
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out
cat > $out/bin/hedgedoc <<EOF
#!${stdenv.shell}/bin/sh
${nodejs}/bin/node $out/app.js
EOF
chmod +x $out/bin/hedgedoc
wrapProgram $out/bin/hedgedoc \
makeWrapper ${nodejs}/bin/node $out/bin/hedgedoc \
--add-flags $out/app.js \
--set NODE_ENV production \
--set NODE_PATH "$out/lib/node_modules"
runHook postDist
runHook postInstall
'';
passthru = {
inherit offlineCache;
tests = { inherit (nixosTests) hedgedoc; };
};

213
pkgs/servers/web-apps/hedgedoc/package.json
View File

@@ -1,213 +0,0 @@
{
"name": "HedgeDoc",
"version": "1.9.7",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",
"scripts": {
"test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
"eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js",
"jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
"markdownlint": "remark .",
"mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
"standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
"dev": "webpack --config webpack.dev.js --progress --watch",
"heroku-prebuild": "bin/heroku",
"build": "webpack --config webpack.prod.js --progress",
"start": "node app.js"
},
"dependencies": {
"@passport-next/passport-openid": "^1.0.0",
"Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
"archiver": "^5.0.2",
"async": "^3.0.0",
"aws-sdk": "^2.1243.0",
"azure-storage": "^2.7.0",
"base64url": "^3.0.0",
"body-parser": "^1.15.2",
"chance": "^1.0.4",
"cheerio": "^0.22.0",
"clean-webpack-plugin": "^4.0.0",
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^7.1.2",
"cookie": "^0.5.0",
"cookie-parser": "^1.4.3",
"deep-freeze": "^0.0.1",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^3.0.0",
"express": ">=4.14",
"express-session": "^1.14.2",
"file-type": "^18.0.0",
"formidable": "^2.0.0",
"graceful-fs": "^4.1.11",
"helmet": "^4.5.0",
"i18n": "^0.15.0",
"is-svg": "^4.3.1",
"jsdom-nogyp": "^0.8.3",
"lodash": "^4.17.20",
"lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git",
"mariadb": "^3.0.2",
"markdown-it": "^13.0.0",
"markdown-it-abbr": "^1.0.4",
"markdown-it-container": "^3.0.0",
"markdown-it-deflist": "^2.0.1",
"markdown-it-emoji": "^2.0.0",
"markdown-it-footnote": "^3.0.1",
"markdown-it-imsize": "^2.0.1",
"markdown-it-ins": "^3.0.0",
"markdown-it-mark": "^3.0.0",
"markdown-it-mathjax": "^2.0.0",
"markdown-it-regexp": "^0.4.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"mattermost": "^3.4.0",
"meta-marked": "git+https://github.com/hedgedoc/meta-marked",
"method-override": "^3.0.0",
"minimist": "^1.2.0",
"minio": "7.0.32",
"moment": "^2.17.1",
"morgan": "^1.7.0",
"mysql2": "^3.0.0",
"node-fetch": "^2.6.1",
"passport": "^0.6.0",
"passport-dropbox-oauth2": "^1.1.0",
"passport-facebook": "^3.0.0",
"passport-github": "^1.1.0",
"passport-gitlab2": "^5.0.0",
"passport-google-oauth20": "^2.0.0",
"passport-ldapauth": "^3.0.0",
"passport-local": "^1.0.0",
"passport-oauth2": "^1.4.0",
"passport-saml": "^3.1.2",
"passport-twitter": "^1.0.4",
"passport.socketio": "^3.7.0",
"pdfobject": "^2.0.201604172",
"pg": "^8.2.1",
"pg-hstore": "^2.3.3",
"prom-client": "^14.0.0",
"prometheus-api-metrics": "^3.2.0",
"randomcolor": "^0.6.0",
"readline-sync": "^1.4.7",
"rimraf": "^4.0.0",
"sanitize-filename": "^1.6.3",
"scrypt-kdf": "^2.0.1",
"sequelize": "^5.21.1",
"shortid": "2.2.16",
"socket.io": "^2.1.1",
"sqlite3": "^5.0.8",
"store": "^2.0.12",
"string": "^3.3.3",
"toobusy-js": "^0.5.1",
"umzug": "^2.3.0",
"uuid": "^9.0.0",
"validator": "^13.0.0",
"winston": "^3.1.0",
"xss": "^1.0.3"
},
"engines": {
"node": "^14.13.1 || 16.x"
},
"bugs": "https://github.com/hedgedoc/hedgedoc/issues",
"keywords": [
"Collaborative",
"Markdown",
"Notes"
],
"homepage": "https://hedgedoc.org",
"maintainers": [
{
"name": "Claudius Coenen",
"url": "https://www.claudiuscoenen.de/"
},
{
"name": "Christoph (Sheogorath) Kern",
"email": "codimd@sheogorath.shivering-isles.com",
"url": "https://shivering-isles.com"
},
{
"name": "David Mehren",
"email": "hedgedoc@herrmehren.de"
}
],
"repository": {
"type": "git",
"url": "https://github.com/hedgedoc/hedgedoc.git"
},
"devDependencies": {
"abcjs": "6.1.9",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-loader": "7.1.5",
"babel-plugin-transform-runtime": "6.23.0",
"babel-polyfill": "6.26.0",
"babel-preset-env": "1.7.0",
"babel-runtime": "6.26.0",
"bootstrap": "3.4.1",
"bootstrap-validator": "0.11.9",
"codemirror": "git+https://github.com/hedgedoc/CodeMirror.git#hedgedoc/1.9.7",
"copy-webpack-plugin": "6.4.1",
"css-loader": "5.2.7",
"emojify.js": "1.1.0",
"esbuild-loader": "3.0.1",
"escape-html": "1.0.3",
"eslint": "8.34.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-n": "15.6.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-standard": "4.1.0",
"exports-loader": "1.1.1",
"expose-loader": "1.0.3",
"file-loader": "6.2.0",
"file-saver": "2.0.5",
"flowchart.js": "1.17.1",
"fork-awesome": "1.2.0",
"gist-embed": "2.6.0",
"highlight.js": "10.7.3",
"html-webpack-plugin": "4.5.2",
"imports-loader": "1.2.0",
"ionicons": "2.0.1",
"jquery": "3.6.3",
"jquery-mousewheel": "3.1.13",
"jquery-ui": "1.13.2",
"js-cookie": "3.0.1",
"js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "3.14.1",
"jsonlint": "1.6.3",
"keymaster": "1.6.2",
"less": "4.1.3",
"less-loader": "7.3.0",
"list.js": "2.3.1",
"mathjax": "2.7.9",
"mermaid": "9.1.7",
"mini-css-extract-plugin": "1.6.2",
"mocha": "10.2.0",
"mock-require": "3.0.3",
"optimize-css-assets-webpack-plugin": "6.0.1",
"prismjs": "1.29.0",
"raphael": "2.3.0",
"remark-cli": "11.0.0",
"remark-preset-lint-markdown-style-guide": "5.1.2",
"reveal.js": "3.9.2",
"select2": "3.5.2-browserify",
"socket.io-client": "2.5.0",
"spin.js": "4.1.1",
"string-loader": "0.0.1",
"turndown": "7.1.1",
"url-loader": "4.1.1",
"velocity-animate": "1.5.2",
"visibilityjs": "2.0.2",
"viz.js": "1.8.2",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.8.0",
"wurl": "2.5.4"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
"utf-8-validate": "^6.0.0"
}
}

31
pkgs/servers/web-apps/hedgedoc/update.sh
View File

@@ -1,31 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
set -euo pipefail
cd "$(dirname "$0")"
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the hedgedoc packages."
echo "Usage: $0 [git release tag]"
exit 1
fi
version="$1"
if [ -z "$version" ]; then
version="$(wget -O- "https://api.github.com/repos/hedgedoc/hedgedoc/releases?per_page=1" | jq -r '.[0].tag_name')"
fi
src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version"
wget "$src/package.json" -O package.json
wget "$src/yarn.lock" -O yarn.lock
src_old_hash=$(nix-prefetch-url --unpack "https://github.com/hedgedoc/hedgedoc/releases/download/$version/hedgedoc-$version.tar.gz")
src_hash=$(nix hash to-sri --type sha256 $src_old_hash)
yarn_hash=$(prefetch-yarn-deps yarn.lock)
sed -i "s|version = \".*\"|version = \"$version\"|" default.nix
sed -i "s|hash = \".*\"|hash = \"$src_hash\"|" default.nix
sed -i "s|sha256 = \".*\"|sha256 = \"$yarn_hash\"|" default.nix
rm yarn.lock

14
pkgs/tools/security/semgrep/common.nix
View File

@@ -1,9 +1,9 @@
{ lib }:
rec {
version = "1.27.0";
version = "1.34.1";
srcHash = "sha256-F6n3LQY4a5sO6c8SMQF9YjjgOS+v2SH+UQPwhg2EX7Q=";
srcHash = "sha256-jbwG3Xyb/rEyz7aR51/pfc+bU/KY9k6BsByZg6KDY5s=";
# submodule dependencies
# these are fetched so we:
@@ -13,8 +13,8 @@ rec {
"cli/src/semgrep/semgrep_interfaces" = {
owner = "returntocorp";
repo = "semgrep-interfaces";
rev = "213f67abea73546ca6111e1bbf0ef96aa917c940";
hash = "sha256-HeNHJkTje9j16+dwsfyMhoqQn/J18q/7XvQPRwgTw/Y=";
rev = "f7fed064dadb859f0b802b11fb60f7f77008c4d7";
hash = "sha256-EXYRc6p94QxkOBMPOdr608JqLY6kN1AanlRfOFXxPm8=";
};
};
@@ -25,15 +25,15 @@ rec {
core = {
x86_64-linux = {
platform = "any";
hash = "sha256-cRj81dXpAE6S0EXajsRikOIAPzlUf42FhiDCWjv+wZQ=";
hash = "sha256-XogITZZtuNmWBrCfL5qpHJNm6jFxzraZMXWhUotXA4c=";
};
x86_64-darwin = {
platform = "macosx_10_14_x86_64";
hash = "sha256-jqfGVZGF/DFgXkr7kQg6QyqEELSr8AKE3Ga8kTftnIY=";
hash = "sha256-YjV915SZ2L8t6huToErTHRd82m4I+evPyeuwpVzi26o=";
};
aarch64-darwin = {
platform = "macosx_11_0_arm64";
hash = "sha256-e/uCSRMdbVD0lvc0hukbiUzheqRNIIh1LgMq6Ae7JYI=";
hash = "sha256-BAnYYeUWosAorcHpqUMpRXJFl4NQDPbWTsykDN3w5UQ=";
};
};

4
pkgs/tools/security/semgrep/default.nix
View File

@@ -102,6 +102,10 @@ buildPythonApplication rec {
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ semgrep-core ]})
'';
postInstall = ''
chmod +x $out/bin/{,py}semgrep
'';
passthru = {
inherit common;
submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules;

2
pkgs/tools/security/semgrep/semgrep-core.nix
View File

@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
inherit version;
format = "wheel";
dist = python;
python = "cp37.cp38.cp39.py37.py38.py39";
python = "cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311";
inherit (data) platform hash;
};

5
pkgs/tools/security/semgrep/update.sh
View File

@@ -15,7 +15,6 @@ fi
ROOT="$(dirname "$(readlink -f "$0")")"
NIXPKGS_ROOT="$ROOT/../../../.."
NIX_DRV="$ROOT/default.nix"
COMMON_FILE="$ROOT/common.nix"
@@ -59,7 +58,7 @@ fetchPypi rec {
version = \"$VERSION\";
format = \"wheel\";
dist = python;
python = \"cp37.cp38.cp39.py37.py38.py39\";
python = \"cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\";
platform = \"$PLATFORM\";
}
"
@@ -131,8 +130,6 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas
continue
fi
NEW_URL=$(instantiateClean semgrep.passthru.submodulesSubset."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g")
TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE"
replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE"

6
pkgs/top-level/all-packages.nix
View File

@@ -25467,7 +25467,7 @@ with pkgs;
theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
};
irrd = callPackage ../servers/irrd { };
irrd = callPackage ../servers/misc/irrd { };
inspircd = callPackage ../servers/irc/inspircd { };
@@ -30686,13 +30686,13 @@ with pkgs;
firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-115;
firefox = wrapFirefox firefox-unwrapped { };
firefox-beta = wrapFirefox firefox-beta-unwrapped { };
firefox-devedition = wrapFirefox firefox-devedition-unwrapped { };
firefox-esr = firefox-esr-102;
firefox-esr = firefox-esr-115;
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };

4
pkgs/top-level/python-packages.nix
View File

@@ -2087,6 +2087,8 @@ self: super: with self; {
coreapi = callPackage ../development/python-modules/coreapi { };
coredis = callPackage ../development/python-modules/coredis { };
coreschema = callPackage ../development/python-modules/coreschema { };
cornice = callPackage ../development/python-modules/cornice { };
@@ -6900,6 +6902,8 @@ self: super: with self; {
py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { };
py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };
nwdiag = callPackage ../development/python-modules/nwdiag { };
oasatelematics = callPackage ../development/python-modules/oasatelematics { };