Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -309,7 +309,7 @@ The attribute can also contain a list, a script followed by arguments to be pass
|
||||
passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
|
||||
```
|
||||
|
||||
The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update.
|
||||
The script will be run with the `UPDATE_NIX_NAME`, `UPDATE_NIX_PNAME`, `UPDATE_NIX_OLD_VERSION` and `UPDATE_NIX_ATTR_PATH` environment variables set respectively to the name, pname, old version and attribute path of the package it is supposed to update.
|
||||
|
||||
::: {.note}
|
||||
The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that.
|
||||
|
||||
@@ -5235,6 +5235,12 @@
|
||||
fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619";
|
||||
}];
|
||||
};
|
||||
harvidsen = {
|
||||
email = "harvidsen@gmail.com";
|
||||
github = "harvidsen";
|
||||
githubId = 62279738;
|
||||
name = "Håkon Arvidsen";
|
||||
};
|
||||
haslersn = {
|
||||
email = "haslersn@fius.informatik.uni-stuttgart.de";
|
||||
github = "haslersn";
|
||||
|
||||
@@ -52,7 +52,17 @@ async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_di
|
||||
eprint(f" - {package['name']}: UPDATING ...")
|
||||
|
||||
try:
|
||||
update_process = await check_subprocess('env', f"UPDATE_NIX_ATTR_PATH={package['attrPath']}", *update_script_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, cwd=worktree)
|
||||
update_process = await check_subprocess(
|
||||
'env',
|
||||
f"UPDATE_NIX_NAME={package['name']}",
|
||||
f"UPDATE_NIX_PNAME={package['pname']}",
|
||||
f"UPDATE_NIX_OLD_VERSION={package['oldVersion']}",
|
||||
f"UPDATE_NIX_ATTR_PATH={package['attrPath']}",
|
||||
*update_script_command,
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.PIPE,
|
||||
cwd=worktree,
|
||||
)
|
||||
update_info = await update_process.stdout.read()
|
||||
|
||||
await merge_changes(merge_lock, package, update_info, temp_dir)
|
||||
|
||||
@@ -37,27 +37,76 @@ in
|
||||
};
|
||||
|
||||
initialEmail = mkOption {
|
||||
description = lib.mdDoc "Initial email for the pgAdmin account.";
|
||||
description = lib.mdDoc "Initial email for the pgAdmin account";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
initialPasswordFile = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Initial password file for the pgAdmin account.
|
||||
NOTE: Should be string not a store path, to prevent the password from being world readable.
|
||||
NOTE: Should be string not a store path, to prevent the password from being world readable
|
||||
'';
|
||||
type = types.path;
|
||||
};
|
||||
|
||||
emailServer = {
|
||||
enable = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Enable SMTP email server. This is necessary, if you want to use password recovery or change your own password
|
||||
'';
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
address = mkOption {
|
||||
description = lib.mdDoc "SMTP server for email delivery";
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
};
|
||||
port = mkOption {
|
||||
description = lib.mdDoc "SMTP server port for email delivery";
|
||||
type = types.port;
|
||||
default = 25;
|
||||
};
|
||||
useSSL = mkOption {
|
||||
description = lib.mdDoc "SMTP server should use SSL";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
useTLS = mkOption {
|
||||
description = lib.mdDoc "SMTP server should use TLS";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
username = mkOption {
|
||||
description = lib.mdDoc "SMTP server username for email delivery";
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
};
|
||||
sender = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
SMTP server sender email for email delivery. Some servers require this to be a valid email address from that server
|
||||
'';
|
||||
type = types.str;
|
||||
example = "noreply@example.com";
|
||||
};
|
||||
passwordFile = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Password for SMTP email account.
|
||||
NOTE: Should be string not a store path, to prevent the password from being world readable
|
||||
'';
|
||||
type = types.path;
|
||||
};
|
||||
};
|
||||
|
||||
openFirewall = mkEnableOption (lib.mdDoc "firewall passthrough for pgadmin4");
|
||||
|
||||
settings = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Settings for pgadmin4.
|
||||
[Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html).
|
||||
[Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html)
|
||||
'';
|
||||
type = pyType;
|
||||
default= {};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -69,6 +118,13 @@ in
|
||||
SERVER_MODE = true;
|
||||
} // (optionalAttrs cfg.openFirewall {
|
||||
DEFAULT_SERVER = mkDefault "::";
|
||||
}) // (optionalAttrs cfg.emailServer.enable {
|
||||
MAIL_SERVER = cfg.emailServer.address;
|
||||
MAIL_PORT = cfg.emailServer.port;
|
||||
MAIL_USE_SSL = cfg.emailServer.useSSL;
|
||||
MAIL_USE_TLS = cfg.emailServer.useTLS;
|
||||
MAIL_USERNAME = cfg.emailServer.username;
|
||||
SECURITY_EMAIL_SENDER = cfg.emailServer.sender;
|
||||
});
|
||||
|
||||
systemd.services.pgadmin = {
|
||||
@@ -115,10 +171,14 @@ in
|
||||
group = "pgadmin";
|
||||
};
|
||||
|
||||
users.groups.pgadmin = {};
|
||||
users.groups.pgadmin = { };
|
||||
|
||||
environment.etc."pgadmin/config_system.py" = {
|
||||
text = formatPy cfg.settings;
|
||||
text = lib.optionalString cfg.emailServer.enable ''
|
||||
with open("${cfg.emailServer.passwordFile}") as f:
|
||||
pw = f.read()
|
||||
MAIL_PASSWORD = pw
|
||||
'' + formatPy cfg.settings;
|
||||
mode = "0600";
|
||||
user = "pgadmin";
|
||||
group = "pgadmin";
|
||||
|
||||
@@ -555,6 +555,9 @@ while read -u 3 mountPoint; do
|
||||
|
||||
umount /tmp-iso
|
||||
rmdir /tmp-iso
|
||||
if [ -n "$isoPath" ] && [ $fsType = "iso9660" ] && mountpoint -q /findiso; then
|
||||
umount /findiso
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
|
||||
|
||||
@@ -106,15 +106,15 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
|
||||
&& sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
|
||||
)
|
||||
|
||||
# don't bother to test LDAP authentification
|
||||
# exclude resql test due to recent postgres 14.4 update
|
||||
# see bugreport here https://redmine.postgresql.org/issues/7527
|
||||
# Don't bother to test LDAP or kerberos authentification
|
||||
# For now deactivate change_password API test. Current bug report at https://redmine.postgresql.org/issues/7648
|
||||
# Password change works from the UI, if email SMTP is configured.
|
||||
with subtest("run browser test"):
|
||||
machine.succeed(
|
||||
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||
&& python regression/runtests.py \
|
||||
--pkg browser \
|
||||
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,resql'
|
||||
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking,browser.tests.test_change_password'
|
||||
)
|
||||
|
||||
# fontconfig is necessary for chromium to run
|
||||
@@ -126,11 +126,10 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
|
||||
&& python regression/runtests.py --pkg feature_tests'
|
||||
)
|
||||
|
||||
# reactivate this test again, when the postgres 14.4 test has been fixed
|
||||
# with subtest("run resql test"):
|
||||
# machine.succeed(
|
||||
# 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||
# && python regression/runtests.py --pkg resql'
|
||||
# )
|
||||
with subtest("run resql test"):
|
||||
machine.succeed(
|
||||
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||
&& python regression/runtests.py --pkg resql'
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "famistudio";
|
||||
version = "4.0.1";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
|
||||
stripRoot = false;
|
||||
sha256 = "sha256-pAULW2aIaKiA61rARpL+hSoffnQO6hfqVpOcEMwD7oo=";
|
||||
sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pandas
|
||||
, prompt-toolkit
|
||||
, databricks-sql-connector
|
||||
, pygments
|
||||
, configobj
|
||||
, sqlparse
|
||||
, cli-helpers
|
||||
, click
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "databricks-sql-cli";
|
||||
version = "0.1.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sql-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/databricks/databricks-sql-cli/pull/38
|
||||
(fetchpatch {
|
||||
url = "https://github.com/databricks/databricks-sql-cli/commit/fc294e00819b6966f1605e5c1ce654473510aefe.patch";
|
||||
sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \
|
||||
--replace 'pandas = "1.3.4"' 'pandas = "~1.4"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
prompt-toolkit
|
||||
pandas
|
||||
databricks-sql-connector
|
||||
pygments
|
||||
configobj
|
||||
sqlparse
|
||||
cli-helpers
|
||||
click
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for querying Databricks SQL";
|
||||
homepage = "https://github.com/databricks/databricks-sql-cli";
|
||||
license = licenses.databricks;
|
||||
maintainers = with maintainers; [ kfollesdal ];
|
||||
};
|
||||
}
|
||||
@@ -20,7 +20,9 @@ let
|
||||
});
|
||||
};
|
||||
commonOverrides = [
|
||||
(mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
(self: super: {
|
||||
jsonschema = super.jsonschema_3;
|
||||
})
|
||||
];
|
||||
};
|
||||
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, packageOverrides ? self: super: {}
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -17,21 +18,7 @@ let
|
||||
];
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: {
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
});
|
||||
}) defaultOverrides;
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||
};
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "gns3-gui";
|
||||
|
||||
@@ -14,22 +14,6 @@
|
||||
|
||||
let
|
||||
defaultOverrides = commonOverrides ++ [
|
||||
(self: super: {
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
})
|
||||
];
|
||||
|
||||
python = python3.override {
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw=";
|
||||
sha256 = "sha256-DArIq5bxyeHy45ZkE+FIpxBl4P6jiHTCN1lVCuF81O8=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
||||
@@ -13,19 +13,7 @@ let
|
||||
packageOverrides = self: super: {
|
||||
# The bravado-core dependency is incompatible with jschonschema 4.0:
|
||||
# https://github.com/Yelp/bravado-core/pull/385
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.2.0";
|
||||
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";
|
||||
sha256 = "";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
doCheck = false;
|
||||
});
|
||||
jsonschema = super.jsonschema_3;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "7.14.0";
|
||||
version = "7.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JuoZ/xE3Z6uB7iJQj72l+VX0cHHi/ZV+6q3QZ/CYjAk=";
|
||||
hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
|
||||
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
|
||||
, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }:
|
||||
, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack
|
||||
, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rtabmap";
|
||||
version = "unstable-2022-02-07";
|
||||
version = "unstable-2022-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "introlab";
|
||||
repo = "rtabmap";
|
||||
rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2";
|
||||
sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40=";
|
||||
rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";
|
||||
sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -23,6 +24,10 @@ stdenv.mkDerivation rec {
|
||||
## Required
|
||||
opencv
|
||||
pcl
|
||||
liblapack
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
xorg.libXt
|
||||
## Optional
|
||||
libusb1
|
||||
eigen
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "0.6.2";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PMWaaCcguziQAnuBL5He2AQaAhCTmpNsOHUNnExK0mU=";
|
||||
sha256 = "sha256-d38PocmvGRvyKMCNMhE8IFNGOn6r42ODLPVo/Ak3q/8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IVlOenWvy6BsUCsSMWuJj7H8XKQRQkJtTYnmUhcesNw=";
|
||||
cargoSha256 = "sha256-74FIlSV/prlxuMxqVx27M0ltXY3m0ddUVyHTltQLnuM=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
||||
@@ -53,6 +53,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch";
|
||||
sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM=";
|
||||
})
|
||||
|
||||
# MultitaskingView: fix allocation assertions
|
||||
# https://github.com/elementary/gala/pull/1463
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch";
|
||||
sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,9 +10,9 @@ let
|
||||
{ case = "8.12"; out = "1.0-beta2-8.12"; }
|
||||
# Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3)
|
||||
# { case = "8.13"; out = "1.0-beta2-8.13"; }
|
||||
{ case = "8.14"; out = "1.0-8.14"; }
|
||||
{ case = "8.15"; out = "1.0-8.15"; }
|
||||
{ case = "8.16"; out = "1.0-8.16"; }
|
||||
{ case = "8.14"; out = "1.1-8.14"; }
|
||||
{ case = "8.15"; out = "1.1-8.15"; }
|
||||
{ case = "8.16"; out = "1.1-8.16"; }
|
||||
] null;
|
||||
release = {
|
||||
"1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
|
||||
@@ -21,6 +21,9 @@ let
|
||||
"1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0=";
|
||||
"1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k=";
|
||||
"1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o=";
|
||||
"1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI=";
|
||||
"1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0=";
|
||||
"1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
@@ -75,10 +78,13 @@ let
|
||||
};
|
||||
} // optionalAttrs (package != "single")
|
||||
{ passthru = genAttrs packages metacoq_; })
|
||||
).overrideAttrs (o: {
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++
|
||||
optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims;
|
||||
});
|
||||
in derivation;
|
||||
).overrideAttrs (o:
|
||||
let requiresOcamlStdlibShims = versionAtLeast o.version "1.0-8.16" ||
|
||||
(o.version == "dev" && (versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;
|
||||
in
|
||||
{
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
|
||||
});
|
||||
in derivation;
|
||||
in
|
||||
metacoq_ (if single then "single" else "all")
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf
|
||||
, zlib, boost, openssl, libtool, python, libiconv, ncurses
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.11";
|
||||
formattedVersion = lib.replaceChars ["."] ["_"] version;
|
||||
|
||||
# Make sure we override python, so the correct version is chosen
|
||||
# for the bindings, if overridden
|
||||
boostPython = boost.override { enablePython = true; inherit python; };
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "libtorrent-rasterbar";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arvidn";
|
||||
repo = "libtorrent";
|
||||
rev = "libtorrent_${formattedVersion}";
|
||||
sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ automake autoconf libtool pkg-config ];
|
||||
buildInputs = [ boostPython openssl zlib python libiconv ncurses ];
|
||||
preConfigure = "./autotool.sh";
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "include" "$dev"
|
||||
moveToOutput "lib/${python.libPrefix}" "$python"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "python" ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-python-binding"
|
||||
"--with-libiconv=yes"
|
||||
"--with-boost=${boostPython.dev}"
|
||||
"--with-boost-libdir=${boostPython.out}/lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
# darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
homepage = "https://libtorrent.org/";
|
||||
description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quarto";
|
||||
version = "1.1.189";
|
||||
version = "1.1.251";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7";
|
||||
sha256 = "sha256-VEYUEI4xzQPXlyTbCThAW2npBCZNPDJ5x2cWnkNz7RE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }:
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner
|
||||
, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "uunf";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
version = "14.0.0";
|
||||
version = "15.0.0";
|
||||
in
|
||||
|
||||
if lib.versionOlder ocaml.version "4.03"
|
||||
@@ -15,11 +18,12 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2";
|
||||
sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
buildInputs = [ topkg uutf cmdliner ];
|
||||
buildInputs = [ topkg uutf ]
|
||||
++ lib.optional cmdlinerSupport cmdliner;
|
||||
|
||||
propagatedBuildInputs = [ uchar ];
|
||||
|
||||
@@ -27,7 +31,15 @@ stdenv.mkDerivation {
|
||||
|
||||
prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${topkg.run} build \
|
||||
--with-uutf true \
|
||||
--with-cmdliner ${lib.boolToString cmdlinerSupport}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OCaml module for normalizing Unicode text";
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, thrift
|
||||
, pandas
|
||||
, pyarrow
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-sql-connector";
|
||||
version = "2.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "databricks-sql-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'thrift = "^0.13.0"' 'thrift = ">=0.13.0,<1.0.0"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
thrift
|
||||
pandas
|
||||
pyarrow
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "tests/unit" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Databricks SQL Connector for Python";
|
||||
homepage = https://docs.databricks.com/dev-tools/python-sql-connector.html;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ harvidsen ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, attrs
|
||||
, functools32
|
||||
, importlib-metadata
|
||||
, mock
|
||||
, nose
|
||||
, pyperf
|
||||
, pyrsistent
|
||||
, setuptools-scm
|
||||
, twisted
|
||||
, vcversioner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonschema";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ];
|
||||
checkInputs = [ nose mock pyperf twisted vcversioner ];
|
||||
|
||||
# zope namespace collides on py27
|
||||
doCheck = !isPy27;
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Julian/jsonschema";
|
||||
description = "An implementation of JSON Schema validation for Python";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "klaus";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonashaag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GyWlIFmP78t+cyPWjjB/EgA/L+2QqHPnmfJ64W5gsf8=";
|
||||
sha256 = "sha256-a0MbKjDqPSMakjmGS5gfaDaPegQpK4QA+ZdG7skd9QU=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wFz82EaxlzsrDVAenp+iomNUPXdisFL8gD/B3oSShqM=";
|
||||
hash = "sha256-6nsc/LVyzjXCtX7GhWbOVc98hPbJZOWAOuys3WPTfYw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage
|
||||
, six, enum34, pyasn1, cryptography
|
||||
, pytestCheckHook }:
|
||||
{ lib
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, six
|
||||
, enum34
|
||||
, pyasn1
|
||||
, cryptography
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pgpy";
|
||||
@@ -10,9 +18,19 @@ buildPythonPackage rec {
|
||||
owner = "SecurityInnovation";
|
||||
repo = "PGPy";
|
||||
rev = "v${version}";
|
||||
sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a";
|
||||
hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402.
|
||||
# by pulling in https://github.com/SecurityInnovation/PGPy/pull/403.
|
||||
(fetchpatch {
|
||||
name = "crytography-38-support.patch";
|
||||
url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch";
|
||||
hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
pyasn1
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypykatz";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GbIWxYCVmNXUwn6W4a/cl1XOTbWkpBemKcmjOvnXER4=";
|
||||
hash = "sha256-djk8b7/H23aDmyGaM60goAcpfZQrpftOIIRKnJjFz50=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.9.8";
|
||||
version = "1.9.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
hash = "sha256-x320F7URZTKcCNdhjiR7hMEUSgbFMhv8e5Csl+IxWt0=";
|
||||
hash = "sha256-DIiShIiTHmJdOtf1WYi4ofJdZnsg13VczVvGW+ngE+I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "10.1.0";
|
||||
version = "11.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cbgpmew+2O59+7pvMv0QD0bi9f6cdWN1zAa9wUdJ1qM=";
|
||||
sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "node_exporter";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
rev = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "node_exporter";
|
||||
sha256 = "sha256-+0k9LBsHqNHmoOAY1UDzbbqni+ikj+c3ijfT41rCfLc=";
|
||||
sha256 = "sha256-KO33Cyrc4Oh6vvTMazo5iuekpyxNsi18gIb66Z8B9i4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nAvODyy+PfkGFAaq+3hBhQaPji5GUMU7N8xcgbGQMeI=";
|
||||
vendorSha256 = "sha256-eJbb56U6VStwfi6iSemWrriDYNaPiDegW3KJr8rH1NU=";
|
||||
|
||||
# FIXME: tests fail due to read-only nix store
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,4 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
, systemd
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chkservice";
|
||||
@@ -8,9 +17,19 @@ stdenv.mkDerivation rec {
|
||||
owner = "linuxenko";
|
||||
repo = "chkservice";
|
||||
rev = version;
|
||||
hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6";
|
||||
hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull fix pending upstream inclusion for gcc-11 support:
|
||||
# https://github.com/linuxenko/chkservice/pull/38
|
||||
(fetchpatch {
|
||||
name = "gcc-11.patch";
|
||||
url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch";
|
||||
hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM=";
|
||||
})
|
||||
];
|
||||
|
||||
# Tools needed during build time
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "6.12";
|
||||
version = "6.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
|
||||
sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";
|
||||
sha256 = "sha256-vLItmE76R1IzgMYEGEvIeOmbfQQac5WK12AkkZknTFU=";
|
||||
};
|
||||
|
||||
yarnDeps = mkYarnModules {
|
||||
@@ -72,13 +72,16 @@ let
|
||||
azure-identity
|
||||
];
|
||||
|
||||
# override necessary on pgadmin4 6.12
|
||||
# keep the scope, as it is used throughout the derivation and tests
|
||||
# this also makes potential future overrides easier
|
||||
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
|
||||
werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.0.3";
|
||||
# flask 2.2 is incompatible with pgadmin 6.13
|
||||
# https://redmine.postgresql.org/issues/7651
|
||||
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.1.3";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
|
||||
sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
|
||||
};
|
||||
});
|
||||
});
|
||||
@@ -124,7 +127,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
# build the documentation
|
||||
cd docs/en_US
|
||||
${sphinx}/bin/sphinx-build -W -b html -d _build/doctrees . _build/html
|
||||
sphinx-build -W -b html -d _build/doctrees . _build/html
|
||||
|
||||
# Build the clean tree
|
||||
cd ../../web
|
||||
@@ -156,7 +159,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
cp -v ../pkg/pip/setup_pip.py setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with pythonPackages; [ cython pip ];
|
||||
nativeBuildInputs = with pythonPackages; [ cython pip sphinx ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
pythonPackages.wheel
|
||||
|
||||
Executable
+27
@@ -0,0 +1,27 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl wget jq yarn2nix yarn common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
|
||||
nixpkgs=$(realpath "$scriptDir"/../../../..)
|
||||
|
||||
newest_version="$(curl -s https://www.pgadmin.org/versions.json | jq -r .pgadmin4.version)"
|
||||
old_version=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).pgadmin4.version" | tr -d '"')
|
||||
url="https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${newest_version}/source/pgadmin4-${newest_version}.tar.gz"
|
||||
|
||||
if [[ $newest_version == $old_version ]]; then
|
||||
echo "Already at latest version $newest_version"
|
||||
exit 0
|
||||
fi
|
||||
echo "New version: $newest_version"
|
||||
|
||||
pushd $(mktemp -d --suffix=-pgadmin4-updater)
|
||||
wget $url
|
||||
tar -xzf "pgadmin4-$newest_version.tar.gz"
|
||||
cd "pgadmin4-$newest_version/web"
|
||||
yarn2nix > yarn.nix
|
||||
cp yarn.nix yarn.lock package.json "$nixpkgs/pkgs/tools/admin/pgadmin/"
|
||||
popd
|
||||
|
||||
update-source-version pgadmin4 "$newest_version" --print-changes
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-gtk";
|
||||
version = "5.0.18";
|
||||
version = "5.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-rQ2HLiI0dIerxRV+fbHpTJy4aGmFKmGd6YckKxXmp4s=";
|
||||
sha256 = "sha256-sD6FN8Ql+OhaQuHLCYreoiqSDC+Xf6OlFWUxg7k9SIk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -1,21 +1,26 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "onetun";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aramperes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
|
||||
sha256 = "sha256-TYDSAJxWwNF/e42KR9656vrWfIanFMaJKvof0gcZ80U=";
|
||||
sha256 = "sha256-gVw1aVbYjDPYTtMYIXq3k+LN0gUBAbQm275sxzwoYw8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-aki3jL+0ETPa/0eMyxuBKdF3K1wM86BZx8FrOkaUAFQ=";
|
||||
cargoSha256 = "sha256-/sOjd0JKk3MNNXYpTEXteFYtqDWYfyVItZrkX4uzjtc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scilla";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg=";
|
||||
sha256 = "sha256-8ZRYgQ4xME71vlO0nKnxiCqeju0G4SwgEXnUol1jQxk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aoz2H7hkk85ntao6e5Chn++T2kA5jogHrd/ltVqNS3A=";
|
||||
vendorSha256 = "sha256-Y4Zi0Hy6ydGxLTohgJGF3L9O+79z+3t+4ZA64otCJpE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Information gathering tool for DNS, ports and more";
|
||||
|
||||
@@ -618,7 +618,6 @@ mapAliases ({
|
||||
libtensorflow-bin = libtensorflow; # Added 2022-09-25
|
||||
libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
|
||||
libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24
|
||||
libtorrentRasterbar-1_1_x = throw "'libtorrentRasterbar-1_1_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_1_x'"; # Converted to throw 2022-09-24
|
||||
libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2022-09-24
|
||||
libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2022-09-24
|
||||
libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22
|
||||
|
||||
@@ -208,9 +208,7 @@ with pkgs;
|
||||
}
|
||||
'');
|
||||
|
||||
chkservice = callPackage ../tools/admin/chkservice {
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
chkservice = callPackage ../tools/admin/chkservice { };
|
||||
|
||||
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
|
||||
|
||||
@@ -430,6 +428,8 @@ with pkgs;
|
||||
|
||||
cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };
|
||||
|
||||
databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
|
||||
|
||||
datalad = callPackage ../applications/version-management/datalad {
|
||||
python3 = python39; # `boto` currently broken with Python3.10
|
||||
};
|
||||
@@ -9542,7 +9542,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
onetun = callPackage ../tools/networking/onetun { };
|
||||
onetun = callPackage ../tools/networking/onetun {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
|
||||
|
||||
@@ -20358,10 +20360,6 @@ with pkgs;
|
||||
python = python2;
|
||||
};
|
||||
|
||||
libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix {
|
||||
python = python2;
|
||||
};
|
||||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
# this is still the new version of the old API
|
||||
|
||||
@@ -2263,6 +2263,8 @@ in {
|
||||
|
||||
databricks-connect = callPackage ../development/python-modules/databricks-connect { };
|
||||
|
||||
databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };
|
||||
|
||||
dataclasses = callPackage ../development/python-modules/dataclasses { };
|
||||
|
||||
dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };
|
||||
@@ -4846,6 +4848,8 @@ in {
|
||||
|
||||
jsonschema = callPackage ../development/python-modules/jsonschema { };
|
||||
|
||||
jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { };
|
||||
|
||||
jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { };
|
||||
|
||||
jsonstreams = callPackage ../development/python-modules/jsonstreams { };
|
||||
|
||||
Reference in New Issue
Block a user