mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 08:30:21 +02:00
Merge staging-next into staging
This commit is contained in:
commit
afc666deed
|
@ -145,6 +145,12 @@
|
|||
githubId = 16829510;
|
||||
name = "Aaron Janse";
|
||||
};
|
||||
aaronjheng = {
|
||||
email = "wentworth@outlook.com";
|
||||
github = "aaronjheng";
|
||||
githubId = 806876;
|
||||
name = "Aaron Jheng";
|
||||
};
|
||||
aaronschif = {
|
||||
email = "aaronschif@gmail.com";
|
||||
github = "aaronschif";
|
||||
|
@ -8910,9 +8916,9 @@
|
|||
githubId = 2946283;
|
||||
name = "Brian Cohen";
|
||||
};
|
||||
novoxudonoser = {
|
||||
novoxd = {
|
||||
email = "radnovox@gmail.com";
|
||||
github = "novoxudonoser";
|
||||
github = "novoxd";
|
||||
githubId = 6052922;
|
||||
name = "Kirill Struokov";
|
||||
};
|
||||
|
|
|
@ -278,6 +278,17 @@
|
|||
removed due to it being an outdated version.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.kubernetes.scheduler.{port,address}</literal>
|
||||
now set <literal>--secure-port</literal> and
|
||||
<literal>--bind-address</literal> instead of
|
||||
<literal>--port</literal> and <literal>--address</literal>,
|
||||
since the former have been deprecated and are no longer
|
||||
functional in kubernetes>=1.23. Ensure that you are not
|
||||
relying on the insecure behaviour before upgrading.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The DHCP server (<literal>services.dhcpd4</literal>,
|
||||
|
|
|
@ -96,6 +96,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version.
|
||||
|
||||
- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
|
||||
|
||||
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
|
||||
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
|
||||
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
|
||||
|
|
|
@ -66,12 +66,12 @@ in
|
|||
serviceConfig = {
|
||||
Slice = "kubernetes.slice";
|
||||
ExecStart = ''${top.package}/bin/kube-scheduler \
|
||||
--address=${cfg.address} \
|
||||
--bind-address=${cfg.address} \
|
||||
${optionalString (cfg.featureGates != [])
|
||||
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
|
||||
--kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
|
||||
--leader-elect=${boolToString cfg.leaderElect} \
|
||||
--port=${toString cfg.port} \
|
||||
--secure-port=${toString cfg.port} \
|
||||
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
|
||||
${cfg.extraOpts}
|
||||
'';
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geonkick";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "iurie-sw";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60";
|
||||
sha256 = "sha256-wSlZ9pVVqlrPSz20pRdcRLq6pTcibxD7326l9WY7ZDY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
@ -1,29 +1,44 @@
|
|||
{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
|
||||
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
|
||||
# available.
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, wrapQtAppsHook
|
||||
, buildEnv
|
||||
, aspellDicts
|
||||
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
|
||||
# available.
|
||||
, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.0.4";
|
||||
pythonEnv = python3.withPackages (ps: with ps; [
|
||||
pyqt5 docutils pyenchant Markups markdown pygments chardet
|
||||
]);
|
||||
in python3.pkgs.buildPythonApplication {
|
||||
inherit version;
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "retext";
|
||||
version = "7.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "retext-project";
|
||||
repo = "retext";
|
||||
rev = version;
|
||||
sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si";
|
||||
hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ pythonEnv ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
chardet
|
||||
docutils
|
||||
markdown
|
||||
markups
|
||||
pyenchant
|
||||
pygments
|
||||
pyqt5
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove wheel check
|
||||
sed -i -e '31,36d' setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
|
@ -39,10 +54,16 @@ in python3.pkgs.buildPythonApplication {
|
|||
--replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ReText"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Editor for Markdown and reStructuredText";
|
||||
homepage = "https://github.com/retext-project/retext/";
|
||||
description = "Simple but powerful editor for Markdown and reStructuredText";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ klntsky ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
@ -1,42 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, requests
|
||||
, mypy-extensions
|
||||
, django_3
|
||||
, django-extensions
|
||||
, dateparser
|
||||
, youtube-dl
|
||||
, python-crontab
|
||||
, croniter
|
||||
, w3lib
|
||||
, ipython
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
django_3' = django_3.overridePythonAttrs (old: rec {
|
||||
pname = "Django";
|
||||
version = "3.1.7";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac=";
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3.overridePythonAttrs (old: rec {
|
||||
version = "3.1.7";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac=";
|
||||
};
|
||||
});
|
||||
};
|
||||
});
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "archivebox";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
src = python.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
requests
|
||||
mypy-extensions
|
||||
django_3'
|
||||
django
|
||||
django-extensions
|
||||
dateparser
|
||||
youtube-dl
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}:
|
||||
{lib, python3Packages, gettext, qt5, fetchFromGitHub}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dupeguru";
|
||||
version = "4.0.4";
|
||||
version = "4.1.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
@ -10,19 +10,10 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "arsenetar";
|
||||
repo = "dupeguru";
|
||||
rev = version;
|
||||
sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy";
|
||||
sha256 = "sha256-0lJocrNQHTrpslbPE6xjZDWhzza8cAt2js35LvicZKg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# already merged to master, remove next version bump
|
||||
(fetchpatch {
|
||||
name = "remove-m-from-so-var.patch";
|
||||
url = "https://github.com/arsenetar/dupeguru/commit/bd0f53bcbe463c48fe141b73af13542da36d82ba.patch";
|
||||
sha256 = "07iisz8kcr7v8lb21inzj1avlpfhh9k8wcivbd33w49cr3mmnr26";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
python3Packages.pyqt5
|
||||
|
@ -31,6 +22,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
pythonPath = with python3Packages; [
|
||||
pyqt5
|
||||
pyqt5.pyqt5_sip
|
||||
send2trash
|
||||
sphinx
|
||||
polib
|
||||
|
@ -42,9 +34,12 @@ python3Packages.buildPythonApplication rec {
|
|||
"NO_VENV=1"
|
||||
];
|
||||
|
||||
# TODO: package pytest-monkeyplus for running tests
|
||||
# https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123
|
||||
doCheck = false;
|
||||
checkInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
preCheck = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
# Avoid double wrapping Python programs.
|
||||
dontWrapQtApps = true;
|
||||
|
@ -66,6 +61,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = "https://github.com/arsenetar/dupeguru";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.novoxudonoser ];
|
||||
maintainers = [ maintainers.novoxd ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.21";
|
||||
version = "1.2.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0CIemSdgNnYfpwZqfTerd/RZ+mYeFUWTE+v2hwu+9gI=";
|
||||
sha256 = "sha256-pLxCm+T9jdn0FFqbTFe1tsIPTaVTT+QDeLHDxrbpGBg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
@ -6,24 +6,24 @@
|
|||
, substituteAll
|
||||
, nix-update-script
|
||||
# To include additional plugins, pass them here as an overlay.
|
||||
, packageOverrides ? self: super: {}
|
||||
, packageOverrides ? self: super: { }
|
||||
}:
|
||||
let
|
||||
mkOverride = attrname: version: sha256:
|
||||
self: super: {
|
||||
${attrname} = super.${attrname}.overridePythonAttrs (
|
||||
oldAttrs: {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version sha256;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
self: super: {
|
||||
${attrname} = super.${attrname}.overridePythonAttrs (
|
||||
oldAttrs: {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version sha256;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) (
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
|
||||
[
|
||||
# the following dependencies are non trivial to update since later versions introduce backwards incompatible
|
||||
# changes that might affect plugins, or due to other observed problems
|
||||
|
@ -57,7 +57,7 @@ let
|
|||
inherit version;
|
||||
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
|
||||
};
|
||||
doCheck= false;
|
||||
doCheck = false;
|
||||
});
|
||||
}
|
||||
)
|
||||
|
@ -92,7 +92,7 @@ let
|
|||
pysocks
|
||||
];
|
||||
disabledTests = [
|
||||
"testConnect" # requires network access
|
||||
"testConnect" # requires network access
|
||||
];
|
||||
}
|
||||
);
|
||||
|
@ -154,10 +154,60 @@ let
|
|||
disabledTests = [
|
||||
"test_apply_simulates_delivery_info"
|
||||
"test_auto_enabling_integrations_catches_import_error"
|
||||
"test_leaks"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Don't test integrations
|
||||
"tests/integrations"
|
||||
# test crashes on aarch64
|
||||
"tests/test_transport.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# Octoprint fails due to a newly added test in pytest-httpbin
|
||||
# see https://github.com/NixOS/nixpkgs/issues/159864
|
||||
(
|
||||
self: super: {
|
||||
pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTests = [
|
||||
"test_redirect_location_is_https_for_secure_server"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# All test fail on aarch64
|
||||
(
|
||||
self: super: {
|
||||
azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec {
|
||||
doCheck = stdenv.buildPlatform == "x86_64-linux";
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# needs network
|
||||
(
|
||||
self: super: {
|
||||
falcon = super.falcon.overridePythonAttrs (oldAttrs: rec {
|
||||
#pytestFlagsArray = [ "-W ignore::DeprecationWarning" ];
|
||||
disabledTestPaths = oldAttrs.disabledTestPaths ++ [
|
||||
"tests/asgi/test_asgi_servers.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
# update broke some tests
|
||||
(
|
||||
self: super: {
|
||||
sanic = super.sanic.overridePythonAttrs (oldAttrs: rec {
|
||||
disabledTestPaths = oldAttrs.disabledTestPaths ++ [
|
||||
"test_cli.py"
|
||||
"test_cookies.py"
|
||||
# requires network
|
||||
"test_worker.py"
|
||||
];
|
||||
});
|
||||
}
|
||||
|
@ -302,29 +352,30 @@ let
|
|||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
ignoreVersionConstraints = [
|
||||
"cachelib"
|
||||
"colorlog"
|
||||
"emoji"
|
||||
"immutabledict"
|
||||
"PyYAML"
|
||||
"sarge"
|
||||
"sentry-sdk"
|
||||
"watchdog"
|
||||
"wrapt"
|
||||
"zeroconf"
|
||||
];
|
||||
in
|
||||
postPatch =
|
||||
let
|
||||
ignoreVersionConstraints = [
|
||||
"cachelib"
|
||||
"colorlog"
|
||||
"emoji"
|
||||
"immutabledict"
|
||||
"PyYAML"
|
||||
"sarge"
|
||||
"sentry-sdk"
|
||||
"watchdog"
|
||||
"wrapt"
|
||||
"zeroconf"
|
||||
];
|
||||
in
|
||||
''
|
||||
sed -r -i \
|
||||
${lib.concatStringsSep "\n" (
|
||||
map (
|
||||
e:
|
||||
''-e 's@${e}[<>=]+.*@${e}",@g' \''
|
||||
) ignoreVersionConstraints
|
||||
)}
|
||||
setup.py
|
||||
sed -r -i \
|
||||
${lib.concatStringsSep "\n" (
|
||||
map (
|
||||
e:
|
||||
''-e 's@${e}[<>=]+.*@${e}",@g' \''
|
||||
) ignoreVersionConstraints
|
||||
)}
|
||||
setup.py
|
||||
'';
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
@ -360,4 +411,4 @@ let
|
|||
);
|
||||
};
|
||||
in
|
||||
with py.pkgs; toPythonApplication octoprint
|
||||
with py.pkgs; toPythonApplication octoprint
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.22.6";
|
||||
version = "1.23.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NL00GOdkVLVHTlj1RK1+stssioy+0xbtiKn4FZnCuzs=";
|
||||
sha256 = "sha256-Ccf+9mwDv1Fs0+xN8yDkUjh4A3aGox7rBGesyYtkUDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
|
|
@ -2,21 +2,22 @@
|
|||
|
||||
let
|
||||
pname = "lens";
|
||||
version = "5.2.6";
|
||||
build = "${version}-latest.20211104.1";
|
||||
version = "5.3.4";
|
||||
build = "${version}-latest.20220120.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
|
||||
sha256 = "1lkxzgwrgafraimpnciv89fs6r399275vb73drxlg5z83acacf5z";
|
||||
name="${pname}.AppImage";
|
||||
sha256 = "sha256-9vRLQFSocVkHAfgwdKSPhSAO4G/v/ANd0WQmilcZiVw=";
|
||||
name = "${pname}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
profile = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qbec";
|
||||
version = "0.14.8";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splunk";
|
||||
repo = "qbec";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-awuYmazBx7zv/WuDsePzdWNRcpAzLK7lf4L2W2Jbt3A=";
|
||||
sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44=";
|
||||
vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -7,7 +7,21 @@ let
|
|||
];
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
|
||||
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;
|
||||
};
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "gns3-gui";
|
||||
|
|
|
@ -17,13 +17,28 @@ let
|
|||
};
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
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 {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||
};
|
||||
in python.pkgs.buildPythonPackage {
|
||||
in python.pkgs.buildPythonApplication {
|
||||
pname = "gns3-server";
|
||||
inherit version;
|
||||
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, aiohttp, webargs, fetchFromGitHub, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
apispec3 = callPackage ./apispec.nix {};
|
||||
jinja2 = callPackage ../../../../development/python2-modules/jinja2 {};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-apispec";
|
||||
version = "unstable-2021-21-08";
|
||||
|
||||
# unstable so we can use latest webargs
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximdanilchenko";
|
||||
repo = "aiohttp-apispec";
|
||||
rev = "cfa19646394480dda289f6b7af19b7d50f245d81";
|
||||
sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiohttp_apispec"
|
||||
];
|
||||
|
||||
# Requires pytest-sanic, currently broken in nixpkgs
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build and document REST APIs with aiohttp and apispec";
|
||||
homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.viric ];
|
||||
};
|
||||
}
|
|
@ -1,47 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyyaml
|
||||
, prance
|
||||
, marshmallow
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, openapi-spec-validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
prance
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm tests/test_ext_marshmallow.py
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
openapi-spec-validator
|
||||
marshmallow
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"apispec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
|
||||
homepage = "https://github.com/marshmallow-code/apispec";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.viric ];
|
||||
};
|
||||
}
|
|
@ -1,12 +1,15 @@
|
|||
{ stdenv, lib, fetchurl, python3, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x, qt5
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, python3
|
||||
, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x
|
||||
, qt5
|
||||
}:
|
||||
|
||||
let
|
||||
libtorrent = (python3.pkgs.toPythonModule (
|
||||
libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
|
||||
|
||||
aiohttp-apispec = python3.pkgs.callPackage ./aiohttp-apispec.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
|
@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
|
||||
sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9";
|
||||
hash = "sha256-CVZOVOWS0fvfg1yDiWFRa4v4Tpzl8RMVBQ6z0Ib4hfQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -29,40 +32,36 @@ stdenv.mkDerivation rec {
|
|||
pythonPath = [
|
||||
libtorrent
|
||||
] ++ (with python3.pkgs; [
|
||||
twisted
|
||||
netifaces
|
||||
pycrypto
|
||||
pyasn1
|
||||
requests
|
||||
m2crypto
|
||||
pyqt5
|
||||
chardet
|
||||
cherrypy
|
||||
cryptography
|
||||
libnacl
|
||||
configobj
|
||||
decorator
|
||||
feedparser
|
||||
service-identity
|
||||
psutil
|
||||
pillow
|
||||
networkx
|
||||
pony
|
||||
lz4
|
||||
pyqtgraph
|
||||
pyyaml
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
asynctest
|
||||
chardet
|
||||
cherrypy
|
||||
configobj
|
||||
cryptography
|
||||
decorator
|
||||
faker
|
||||
sentry-sdk
|
||||
feedparser
|
||||
libnacl
|
||||
lz4
|
||||
m2crypto
|
||||
netifaces
|
||||
networkx
|
||||
pillow
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pycrypto
|
||||
pyqt5
|
||||
pyqtgraph
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
asynctest
|
||||
pyyaml
|
||||
requests
|
||||
sentry-sdk
|
||||
service-identity
|
||||
twisted
|
||||
yappi
|
||||
|
||||
# there is a BTC feature, but it requires some unclear version of
|
||||
# bitcoinlib, so this doesn't work right now.
|
||||
# bitcoinlib
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
|
@ -84,10 +83,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ xvapx viric ];
|
||||
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
homepage = "https://www.tribler.org/";
|
||||
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
license = licenses.lgpl21;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ xvapx viric ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qpoXUzXRcsUi1WHZAYGgnEaNxBYEQAdkXAz7YPiPae8=";
|
||||
sha256 = "sha256-RlEPC9yyPYj974UVto7w+r24Lc5+Et1Ks49o+QTdrZQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eds2W47+lOwO/HHKR+IjXOJOD8p1OYkk5qilDYTOUyk=";
|
||||
cargoSha256 = "sha256-4tOeYiRBF4qDUiI6yU093y0Ttq7+CdmGaA5eqdMjgow=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.5.0";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw=";
|
||||
sha256 = "sha256-7WaLUCJr29i7JW5YAJG1AuYnSLKRMpAEnCY2i4Zle+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-multi-rtmp";
|
||||
version = "0.2.7.1";
|
||||
version = "0.2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorayuki";
|
||||
repo = "obs-multi-rtmp";
|
||||
rev = version;
|
||||
sha256 = "sha256-pnSIbAWGufcWIARXpX/zwA/Ff35lrinFaMIdFY00c4Y=";
|
||||
sha256 = "sha256-OhatuSlDJ2VDNorM4QfoKPYKyv5YpN8EnIelLdBTlZ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
41
pkgs/applications/virtualization/podman-tui/default.nix
Normal file
41
pkgs/applications/virtualization/podman-tui/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, btrfs-progs
|
||||
, gpgme
|
||||
, lvm2
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qPQSu6l1WkX6sddVr5h1DqKQCyw6vy8S6lXC/ZO4DL8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
btrfs-progs
|
||||
gpgme
|
||||
lvm2
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/containers/podman-tui";
|
||||
description = "Podman Terminal UI";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -59,10 +59,9 @@ switch arg [
|
|||
(optionalAttrs has-owner { owner = head splitted; }));
|
||||
}; }
|
||||
{ case = isAttrs;
|
||||
out = let
|
||||
{ version = arg.version or "dev";
|
||||
src = (arg.fetcher or fetcher) (location // (arg.location or {}));
|
||||
}; }
|
||||
out = {
|
||||
version = arg.version or "dev";
|
||||
src = (arg.fetcher or fetcher) (location // (arg.location or {})); }; }
|
||||
{ case = isPath;
|
||||
out = {
|
||||
version = "dev" ;
|
||||
|
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-maps";
|
||||
version = "41.2";
|
||||
version = "41.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-gYIbTK/GQc1QDXOzMMY85aBahPBDBxbWPoizyuqs/Qw=";
|
||||
sha256 = "sha256-40CxP0b+C31bD48BQTKR3c2HDHSlw4+iTKwfWF5wOT4=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
@ -35,11 +35,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "41.2";
|
||||
version = "41.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "GTr79qMILaCjKncU8ejVKo20Vycpde0vNlQ2SjM5Gz8=";
|
||||
sha256 = "luzS2252xROxjGBtwmK7UjIoxKrtvtageBHlaP1dtkI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -28,6 +28,10 @@ stdenv.mkDerivation {
|
|||
prePatch = lib.optionalString (check-ocaml-version "4.02") ''
|
||||
substituteInPlace myocamlbuild.pre.ml \
|
||||
--replace '@1..3' '@1..2+3'
|
||||
''
|
||||
# Compatibility with PPrint ≥ 20220103
|
||||
+ ''
|
||||
substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml
|
||||
'';
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pkcs11-helper";
|
||||
version = "1.27";
|
||||
version = "1.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenSC";
|
||||
repo = "pkcs11-helper";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5";
|
||||
sha256 = "sha256-gy04f62TX42mW4hKD/jTZXTpz9v6gQXNrY/pv8Ie4p0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/OpenSC/pkcs11-helper";
|
||||
license = with licenses; [ bsd3 gpl2 ];
|
||||
license = with licenses; [ bsd3 gpl2Only ];
|
||||
description = "Library that simplifies the interaction with PKCS#11 providers";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smpeg-svn${version}";
|
||||
pname = "smpeg-svn";
|
||||
version = "390";
|
||||
|
||||
src = fetchsvn {
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
## How to update
|
||||
|
||||
1. bump version of `@google/clasp` in [node-packages.json](./node-packages.json)
|
||||
2. run [generate.sh](./generate.sh)
|
||||
3. set the same version in [default.nix](./default.nix)
|
||||
4. build and test it
|
|
@ -1,19 +0,0 @@
|
|||
{ lib, stdenv, pkgs }:
|
||||
let
|
||||
version = "2.2.1";
|
||||
in
|
||||
(import ./google-clasp.nix {
|
||||
inherit pkgs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
})."@google/clasp-${version}".override {
|
||||
preRebuild = ''
|
||||
patch -p1 <<<"${builtins.readFile ./dotf.patch}"
|
||||
'';
|
||||
meta = {
|
||||
description = "Command Line tool for Google Apps Script Projects";
|
||||
homepage = "https://developers.google.com/apps-script/guides/clasp";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.michojel ];
|
||||
priority = 100;
|
||||
};
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
Index: nodejs/tmp/xcindf87mmqyp0x5blima5q2m9fw3dx3-node__at_google_slash_clasp-2.2.1/lib/node_modules/@google/clasp/src/dotfile.js
|
||||
===================================================================
|
||||
--- clasp.orig/src/dotfile.js
|
||||
+++ clasp/src/dotfile.js
|
||||
@@ -94,7 +94,7 @@ exports.DOTFILE = {
|
||||
return dotf(projectPath ? path_1.default.dirname(projectPath) : exports.DOT.PROJECT.DIR, exports.DOT.PROJECT.NAME);
|
||||
},
|
||||
// Stores {ClaspCredentials}
|
||||
- RC: dotf(exports.DOT.RC.DIR, exports.DOT.RC.NAME),
|
||||
+ RC: dotf.default(exports.DOT.RC.DIR, exports.DOT.RC.NAME),
|
||||
// Stores {ClaspCredentials}
|
||||
RC_LOCAL: function () {
|
||||
var localPath = find_up_1.default.sync(exports.DOT.PROJECT.PATH);
|
|
@ -1,9 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
exec node2nix --nodejs-10 \
|
||||
-i node-packages.json -o node-packages.nix \
|
||||
-c google-clasp.nix \
|
||||
--no-copy-node-env -e ../../../development/node-packages/node-env.nix
|
|
@ -1,17 +0,0 @@
|
|||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
|
@ -1,3 +0,0 @@
|
|||
[
|
||||
{"@google/clasp": "2.2.1"}
|
||||
]
|
2115
pkgs/development/misc/google-clasp/node-packages.nix
generated
2115
pkgs/development/misc/google-clasp/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -7,6 +7,7 @@
|
|||
, "@bitwarden/cli"
|
||||
, "@commitlint/cli"
|
||||
, "@commitlint/config-conventional"
|
||||
, "@google/clasp"
|
||||
, "@hyperspace/cli"
|
||||
, "@medable/mdctl-cli"
|
||||
, "@nerdwallet/shepherd"
|
||||
|
|
3356
pkgs/development/node-packages/node-packages.nix
generated
3356
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -14,7 +14,10 @@ buildDunePackage rec {
|
|||
sha256 = "0wjfc9irvirfkic32ivvj6qb7r838w08b0d3vmngigbjpjyc9b14";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
# Fix tests with pprint ≥ 20220103
|
||||
patches = [ ./pprint.patch ];
|
||||
|
||||
# disable xmldiff tests, so we don't need to package unmaintained and legacy pkgs
|
||||
postPatch = "rm -rf examples/xmldiff";
|
||||
|
|
22
pkgs/development/ocaml-modules/crowbar/pprint.patch
Normal file
22
pkgs/development/ocaml-modules/crowbar/pprint.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
commit 77b5e54d33a66445f45ddc48577d835207be8cef
|
||||
Author: Stephen Dolan <stephen.dolan@cl.cam.ac.uk>
|
||||
Date: Fri Jun 12 19:34:51 2020 +0100
|
||||
|
||||
Unbreak small example logic
|
||||
|
||||
diff --git a/examples/pprint/test_pprint.ml b/examples/pprint/test_pprint.ml
|
||||
index 77789ef..44124e7 100644
|
||||
--- a/examples/pprint/test_pprint.ml
|
||||
+++ b/examples/pprint/test_pprint.ml
|
||||
@@ -1,9 +1,9 @@
|
||||
-open Crowbar
|
||||
open PPrint
|
||||
+open Crowbar
|
||||
type t = (string * PPrint.document)
|
||||
let doc = fix (fun doc -> choose [
|
||||
const ("", empty);
|
||||
- const ("a", char 'a');
|
||||
+ const ("a", PPrint.char 'a');
|
||||
const ("123", string "123");
|
||||
const ("Hello", string "Hello");
|
||||
const ("awordwhichisalittlebittoolong",
|
|
@ -1,38 +1,22 @@
|
|||
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage }:
|
||||
|
||||
assert lib.versionAtLeast (lib.getVersion ocaml) "3.12";
|
||||
buildDunePackage rec {
|
||||
pname = "pprint";
|
||||
version = "20220103";
|
||||
|
||||
let param =
|
||||
if lib.versionAtLeast ocaml.version "4.02"
|
||||
then {
|
||||
version = "20171003";
|
||||
sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx";
|
||||
} else {
|
||||
version = "20140424";
|
||||
sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk";
|
||||
}; in
|
||||
useDune2 = true;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit (param) version;
|
||||
pname = "ocaml${ocaml.version}-pprint";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz";
|
||||
inherit (param) sha256;
|
||||
src = fetchFromGitHub {
|
||||
owner = "fpottier";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256:09y6nwnjldifm47406q1r9987njlk77g4ifqg6qs54dckhr64vax";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
dontBuild = true;
|
||||
installFlags = [ "-C" "src" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://gallium.inria.fr/~fpottier/pprint/";
|
||||
description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer";
|
||||
license = licenses.cecill-c;
|
||||
inherit (src.meta) homepage;
|
||||
description = "An OCaml library for pretty-printing textual documents";
|
||||
license = licenses.lgpl2Only;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python-markdown-math
|
||||
, markdown
|
||||
, docutils
|
||||
, pygments
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Markups";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc";
|
||||
};
|
||||
|
||||
checkInputs = [ markdown docutils pygments pyyaml ];
|
||||
propagatedBuildInputs = [ python-markdown-math ];
|
||||
|
||||
meta = {
|
||||
description = "A wrapper around various text markup languages.";
|
||||
homepage = "https://github.com/retext-project/pymarkups";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ klntsky ];
|
||||
};
|
||||
}
|
58
pkgs/development/python-modules/aiohttp-apispec/default.nix
Normal file
58
pkgs/development/python-modules/aiohttp-apispec/default.nix
Normal file
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, apispec
|
||||
, buildPythonPackage
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, jinja2
|
||||
, packaging
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, webargs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-apispec";
|
||||
version = "3.0.0b1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximdanilchenko";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LGdi5ZhJ1G0GxUJVBZnwW3Q+x3Yo9FRV9b6REPlq7As=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
apispec
|
||||
jinja2
|
||||
packaging
|
||||
webargs
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "jinja2<3.0" "jinja2"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiohttp_apispec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build and document REST APIs with aiohttp and apispec";
|
||||
homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
};
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
pname = "approvaltests";
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
rev = "v${version}";
|
||||
sha256 = "15blwjzd6nwh0kzxa9xxscxdn0vqwb1bax8d46wk01dcywdyd6ni";
|
||||
sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
, marshmallow-enum
|
||||
, marshmallow-sqlalchemy
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, prison
|
||||
, pyjwt
|
||||
, pyyaml
|
||||
|
@ -26,12 +27,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-appbuilder";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-AppBuilder";
|
||||
inherit version;
|
||||
sha256 = "be1e2271cdd7c879d343f57060b50ac411346730df55b35ce242faadcab81c12";
|
||||
sha256 = "sha256-uZzuvNusqMzAS/vmg3CuZ+D442J4LbFwsBboVIx/srE=";
|
||||
};
|
||||
|
||||
# See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch
|
||||
|
@ -83,7 +87,7 @@ buildPythonPackage rec {
|
|||
--replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \
|
||||
--replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \
|
||||
--replace "WTForms<3.0.0" "WTForms" \
|
||||
--replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \
|
||||
--replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \
|
||||
--replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \
|
||||
--replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \
|
||||
--replace "prison>=0.2.1, <1.0.0" "prison" \
|
||||
|
@ -93,10 +97,12 @@ buildPythonPackage rec {
|
|||
# Majority of tests require network access or mongo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "flask_appbuilder" ];
|
||||
pythonImportsCheck = [
|
||||
"flask_appbuilder"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and rapid application development framework, built on top of Flask";
|
||||
description = "Application development framework, built on top of Flask";
|
||||
homepage = "https://github.com/dpgaspar/flask-appbuilder/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.28.25";
|
||||
version = "0.28.26";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-aM4GdDzg561woFio5pHQIdwDiGkWCEVUz0BP6DLBY4E=";
|
||||
sha256 = "sha256-t8SE+TU9OW/iQHVLbEdTgX4azXendKSgJQ4/QpDSkL8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,42 +1,60 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, mypy
|
||||
, pyjwt
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, responses
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "globus-sdk";
|
||||
version = "3.2.1";
|
||||
version = "3.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "globus";
|
||||
repo = "globus-sdk-python";
|
||||
rev = version;
|
||||
sha256 = "12zza78qydkgzqg3j9428g92v7bb55nrwvl5m2il96z39darh7v8";
|
||||
hash = "sha256-0TXBw2ZTZwPzuGnWda26MiK5V5oU85PoGAsn7uJw6fk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
requests
|
||||
pyjwt
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mypy
|
||||
pytestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pyjwt[crypto]>=1.5.3,<2.0.0" "pyjwt[crypto] >=1.5.3, <3.0.0"
|
||||
--replace "pyjwt[crypto]>=2.0.0,<3.0.0" "pyjwt[crypto]>=2.0.0,<3.0.0"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "globus_sdk" ];
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"globus_sdk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
|
||||
description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API";
|
||||
homepage = "https://github.com/globus/globus-sdk-python";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ixxie ];
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6e93c134669bbb7b79be4bd73329842c5e5f071f1fde624fc82233da42677021";
|
||||
sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.10.3";
|
||||
version = "2.10.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hUbD9OPoqGEZG4lcprklU4EMIPoQrVAmtCtOKV6RB5w=";
|
||||
sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
|
|
@ -49,6 +49,8 @@ in
|
|||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -75,7 +77,9 @@ buildPythonPackage rec {
|
|||
sqlalchemy
|
||||
tables
|
||||
toolz
|
||||
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
@ -85,8 +89,13 @@ buildPythonPackage rec {
|
|||
pytest-xdist
|
||||
];
|
||||
|
||||
# these tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "atpublic>=2.3,<3" "atpublic>=2.3"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# These tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291
|
||||
"test_summary_numeric"
|
||||
"test_summary_non_numeric"
|
||||
"test_batting_most_hits"
|
||||
|
@ -130,7 +139,9 @@ buildPythonPackage rec {
|
|||
export PYTEST_BACKENDS="${backendsString}"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends);
|
||||
pythonImportsCheck = [
|
||||
"ibis"
|
||||
] ++ (map (backend: "ibis.backends.${backend}") backends);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Productivity-centric Python Big Data Framework";
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.9";
|
||||
version = "2.4.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4pFkysb0gxgb1oYirTnvQgjEStJkzUn0Ktw33ZP7zA4=";
|
||||
sha256 = "sha256-a12a4PvACkB+zpJts6syDqMPafjhZp1UWnob9UiKMbM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "intellifire4py";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "jeeftor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cNWsKwXVlnZgPjkll1IaEhDHfHNvWCBY6U3B34IdHd0=";
|
||||
hash = "sha256-xuFCikmoQX95h0rzkO03I0IpUzLB2rbPo9IoxmstlmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.18.2";
|
||||
version = "1.18.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5GGY23MDsUbSC2tYGVqwwtFi5vnSldozMR4HuY+h+l4=";
|
||||
sha256 = "sha256-OMFW2xR6X/6H8ouHAe5qX8ltuwkNG9esjdosac+MiNw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jdatetime";
|
||||
version = "3.8.2";
|
||||
version = "4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c685687e3f39e1b9a3ba9c00ed9d8e88603bc8994413e84623e6c5d43214e6f8";
|
||||
sha256 = "sha256-01uuou0hPk6Hu4QMYWNwAVQL0h6ORFS9EjUrBlkewI4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
58
pkgs/development/python-modules/markups/default.nix
Normal file
58
pkgs/development/python-modules/markups/default.nix
Normal file
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchPypi
|
||||
, importlib-metadata
|
||||
, markdown
|
||||
, pygments
|
||||
, pytestCheckHook
|
||||
, python-markdown-math
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, textile
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "markups";
|
||||
version = "3.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Markups";
|
||||
inherit version;
|
||||
hash = "sha256-q5dHpywcZFdBjrQnbHmHGXfBOmVGGOTxLiofCZD78vw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docutils
|
||||
markdown
|
||||
pygments
|
||||
python-markdown-math
|
||||
pyyaml
|
||||
textile
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: '.selector .ch { color: #408080' not found in 'pre...
|
||||
"test_get_pygments_stylesheet"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"markups"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wrapper around various text markup languages";
|
||||
homepage = "https://github.com/retext-project/pymarkups";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ klntsky ];
|
||||
};
|
||||
}
|
|
@ -8,13 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.20.49";
|
||||
version = "1.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dLDHG81vVUO4V8VyD4KJTXO6LoN2+fVQEbWUzT5YSn8=";
|
||||
hash = "sha256-3P3dThYXpmtZ/cn+NCDS9RNtu6N48Vb78ZqmCdkTK50=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,26 +9,33 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nose2";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
# Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5.
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60";
|
||||
hash = "sha256-bSCNfW7J+dVcdNrIHJOUvDkG2++BqMpUILK5t/jmnek=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six coverage ];
|
||||
propagatedBuildInputs = [
|
||||
coverage
|
||||
six
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nose2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "nose2 is the next generation of nicer testing for Python";
|
||||
description = "Test runner for Python";
|
||||
homepage = "https://github.com/nose-devs/nose2";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -7,16 +7,19 @@
|
|||
, scikit-learn
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynndescent";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882";
|
||||
hash = "sha256-YfsxiFuqxGnWeTPix8k1tu3rsG7kmOLw+d/JfFnTclw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -31,6 +34,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pynndescent"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nearest Neighbor Descent";
|
||||
homepage = "https://github.com/lmcinnes/pynndescent";
|
||||
|
|
|
@ -10,14 +10,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyowm";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "csparpa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0sq8rxcgdiayl5gy4qhkvvsdq1d93sbzn0nfg8f1vr8qxh8qkfq4";
|
||||
sha256 = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -26,12 +28,18 @@ buildPythonPackage rec {
|
|||
requests
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Run only tests which don't require network access
|
||||
pytestFlagsArray = [ "tests/unit" ];
|
||||
pytestFlagsArray = [
|
||||
"tests/unit"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyowm" ];
|
||||
pythonImportsCheck = [
|
||||
"pyowm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper around the OpenWeatherMap web API";
|
||||
|
|
|
@ -88,7 +88,7 @@ in buildPythonPackage rec {
|
|||
];
|
||||
|
||||
passthru = {
|
||||
inherit sip;
|
||||
inherit sip pyqt5_sip;
|
||||
multimediaEnabled = withMultimedia;
|
||||
webKitEnabled = withWebKit;
|
||||
WebSocketsEnabled = withWebSockets;
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = version;
|
||||
hash = "sha256-93o1UfoZ+Sb+lMg4Xdd4eGBEdrSCVSin5HJVnaRyp8o=";
|
||||
hash = "sha256-0D0AagmLozF5nLbdcmtE9q65vG2WxWv+hZLTnjmmfEY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -40,14 +40,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-MZ1J2Stq+pRoeJ05hv8cSpxtaeRGaJEWAtidbr8YP88=";
|
||||
sha256 = "sha256-hOWMrAFPwtURIngCN4vCxWrI6QZLOnakkNf+fZVyzzc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -107,8 +107,9 @@ buildPythonPackage rec {
|
|||
"test_start_sentry_listener"
|
||||
# Failing threading test
|
||||
"test_circular_references"
|
||||
# Failing wsgi test
|
||||
# Failing wsgi tests
|
||||
"test_session_mode_defaults_to_request_mode_in_wsgi_handler"
|
||||
"test_auto_session_tracking_with_aggregates"
|
||||
# Network requests to public web
|
||||
"test_crumb_capture"
|
||||
];
|
||||
|
|
48
pkgs/development/python-modules/textile/default.nix
Normal file
48
pkgs/development/python-modules/textile/default.nix
Normal file
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, html5lib
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, regex
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "textile";
|
||||
version = "4.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python-textile";
|
||||
rev = version;
|
||||
hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
html5lib
|
||||
regex
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"textile"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MOdule for generating web text";
|
||||
homepage = "https://github.com/textile/python-textile";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.833";
|
||||
version = "2.0.845";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-82jeUrFIQgTBJ1GApPoSXnq6cuY8bGjAP+sTzfE+XHQ=";
|
||||
hash = "sha256-vF09H2fnMYWxUnadOCfLfAdcWNSVASLvHYLJIhD+Y/4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pack";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA=";
|
||||
sha256 = "sha256-nlSJwo2YjbOOKofZwXdWB3fxRUNTeSUcT6jN987SB3o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0BvZ7xLOr7htp3HVgRt3CzCxx2P62RXKhbzbWtGMLc0=";
|
||||
vendorSha256 = "sha256-4uMd0KaV5xrxuJ9yqpxbD3YTNaBHsH2d/IRtYRyN5+0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.6.5";
|
||||
version = "0.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-drBKpK3iHr+0gfoMHe4stxMbAG6WnA4P0uUoYKq2UCI=";
|
||||
sha256 = "sha256-H+gIN3I0qC2UeBow2N6KjECFiroeZACvrS3vo8+H6jY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FtbSA1YM0/bgKd0ATDG4rqXAmZHPAKNTHGyxeWuvAMo=";
|
||||
vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "operator-sdk";
|
||||
version = "1.12.0";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "operator-framework";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+AWkzv6SI/d3p1ljopSyLg2qi1hv6PsynmVG7+lUSTw=";
|
||||
sha256 = "sha256-zgiJDmpjmm2rzi12XAT+bHpiOKwi1k6xd9fvPGwFNXQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jYBkC0IA2xbRa+56CW/5EWG8sYg3eRuFdLpOFSinuuw=";
|
||||
vendorSha256 = "sha256-kilFwOSIToURJFqfa1/PtdUA21ieJzL9vgsXbYNbht0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -11,19 +11,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4VwDpm61OhMvlbiuA7WFup0JwvLvoS615Pr7f7z0kh4=";
|
||||
sha256 = "sha256-QpYwH9ZmD/muCGtL+9wzz4UKRyHWaga7vrjNjKz4uVQ=";
|
||||
};
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-yiKfVUj3skXF3wk+IzsNucXcopfGm7mYHZsupi/KzZw=";
|
||||
cargoSha256 = "sha256-DFGCjA0AENYDs5EnQ3WDkbCEw14ndjOh7qx2ZFgNGH0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
@ -14,16 +14,16 @@
|
|||
let
|
||||
|
||||
pname = "hplip";
|
||||
version = "3.20.11";
|
||||
version = "3.21.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz";
|
||||
sha256 = "CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE=";
|
||||
sha256 = "sha256-fvRSPvgbztcVFeHIhA72xoxgJjjBWebdmpJpHO7GT5w=";
|
||||
};
|
||||
|
||||
plugin = fetchurl {
|
||||
url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run";
|
||||
sha256 = "r8PoQQFfjdHKySPCFwtDR8Tl6v5Eag9gXpBAp6sCF9Q=";
|
||||
sha256 = "sha256-eyYNhuff8mM4IpRfn/fLBjQJ23JrTdsHBQ/EH7Ug0gw=";
|
||||
};
|
||||
|
||||
hplipState = substituteAll {
|
||||
|
@ -89,11 +89,6 @@ python3Packages.buildPythonApplication {
|
|||
makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ];
|
||||
|
||||
patches = [
|
||||
# remove ImageProcessor usage, it causes segfaults, see
|
||||
# https://bugs.launchpad.net/hplip/+bug/1788706
|
||||
# https://bugs.launchpad.net/hplip/+bug/1787289
|
||||
./image-processor.patch
|
||||
|
||||
# HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS
|
||||
# paths, and hp-setup crashes if none of these paths actually exist (which they
|
||||
# don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share.
|
||||
|
@ -123,19 +118,25 @@ python3Packages.buildPythonApplication {
|
|||
{} +
|
||||
'';
|
||||
|
||||
configureFlags = let out = placeholder "out"; in [
|
||||
"--with-hpppddir=${out}/share/cups/model/HP"
|
||||
"--with-cupsfilterdir=${out}/lib/cups/filter"
|
||||
"--with-cupsbackenddir=${out}/lib/cups/backend"
|
||||
"--with-icondir=${out}/share/applications"
|
||||
"--with-systraydir=${out}/xdg/autostart"
|
||||
"--with-mimedir=${out}/etc/cups"
|
||||
"--enable-policykit"
|
||||
"--disable-qt4"
|
||||
]
|
||||
configureFlags = let out = placeholder "out"; in
|
||||
[
|
||||
"--with-hpppddir=${out}/share/cups/model/HP"
|
||||
"--with-cupsfilterdir=${out}/lib/cups/filter"
|
||||
"--with-cupsbackenddir=${out}/lib/cups/backend"
|
||||
"--with-icondir=${out}/share/applications"
|
||||
"--with-systraydir=${out}/xdg/autostart"
|
||||
"--with-mimedir=${out}/etc/cups"
|
||||
"--enable-policykit"
|
||||
"--disable-qt4"
|
||||
|
||||
# remove ImageProcessor usage, it causes segfaults, see
|
||||
# https://bugs.launchpad.net/hplip/+bug/1788706
|
||||
# https://bugs.launchpad.net/hplip/+bug/1787289
|
||||
"--disable-imageProcessor-build"
|
||||
]
|
||||
++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install"
|
||||
++ lib.optional withQt5 "--enable-qt5"
|
||||
;
|
||||
;
|
||||
|
||||
# Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
|
||||
# generation of '*.ppd' files.
|
||||
|
|
|
@ -1,115 +0,0 @@
|
|||
From 207aa582477dd874d1651db2d0654c5d6adb6e0a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Fri, 20 Dec 2019 13:13:52 +0000
|
||||
Subject: [PATCH] remove imageprocessor
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
Makefile.in | 2 +-
|
||||
prnt/hpcups/HPCupsFilter.cpp | 19 -------------------
|
||||
3 files changed, 3 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 891660d..484a051 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
|
||||
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
|
||||
endif #HPLIP_CLASS_DRIVER
|
||||
|
||||
-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
|
||||
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
|
||||
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
|
||||
|
||||
if !HPLIP_CLASS_DRIVER
|
||||
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
|
||||
prnt/hpcups/ImageProcessor.h
|
||||
|
||||
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
||||
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
#else
|
||||
#hpcupsdir = $(cupsfilterdir)
|
||||
#hpcups_PROGRAMS = hpcups
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 16c39f0..46a767e 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -4814,7 +4814,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
|
||||
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
|
||||
|
||||
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
||||
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
#else
|
||||
#hpcupsdir = $(cupsfilterdir)
|
||||
#hpcups_PROGRAMS = hpcups
|
||||
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
|
||||
index 5b282d8..153ee3a 100644
|
||||
--- a/prnt/hpcups/HPCupsFilter.cpp
|
||||
+++ b/prnt/hpcups/HPCupsFilter.cpp
|
||||
@@ -31,7 +31,6 @@
|
||||
\*****************************************************************************/
|
||||
|
||||
#include "HPCupsFilter.h"
|
||||
-#include "ImageProcessor.h"
|
||||
|
||||
#include <signal.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
|
||||
|
||||
|
||||
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
|
||||
- image_processor_t* imageProcessor = imageProcessorCreate();
|
||||
|
||||
while (cupsRasterReadHeader2(cups_raster, &cups_header))
|
||||
{
|
||||
|
||||
- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
|
||||
- if (result != IPE_SUCCESS){
|
||||
- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
|
||||
- }
|
||||
-
|
||||
current_page_number++;
|
||||
|
||||
if (current_page_number == 1) {
|
||||
@@ -745,11 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
|
||||
color_raster = rgbRaster;
|
||||
black_raster = kRaster;
|
||||
|
||||
- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
|
||||
- if (result != IPE_SUCCESS){
|
||||
- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
|
||||
- }
|
||||
-
|
||||
|
||||
if ((y == 0) && !is_ljmono) {
|
||||
//For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
|
||||
@@ -780,11 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
|
||||
}
|
||||
} // for() loop end
|
||||
|
||||
- result = imageProcessorEndPage(imageProcessor);
|
||||
- if (result != IPE_SUCCESS){
|
||||
- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
|
||||
- }
|
||||
-
|
||||
|
||||
m_Job.NewPage();
|
||||
if (err != NO_ERROR) {
|
||||
@@ -800,8 +783,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
|
||||
rgbRaster = NULL;
|
||||
}
|
||||
|
||||
- imageProcessorDestroy(imageProcessor);
|
||||
-
|
||||
unlink(hpPreProcessedRasterFile);
|
||||
return ret_status;
|
||||
}
|
||||
--
|
||||
2.24.1
|
||||
|
|
@ -5627,6 +5627,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/";
|
||||
};
|
||||
|
||||
rest-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "rest.nvim";
|
||||
version = "2022-01-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NTBBloodbath";
|
||||
repo = "rest.nvim";
|
||||
rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3";
|
||||
sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8";
|
||||
};
|
||||
meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";
|
||||
};
|
||||
|
||||
riv-vim = buildVimPluginFrom2Nix {
|
||||
pname = "riv.vim";
|
||||
version = "2021-08-09";
|
||||
|
|
|
@ -534,6 +534,11 @@ self: super: {
|
|||
dependencies = with self; [ nvim-treesitter plenary-nvim ];
|
||||
});
|
||||
|
||||
# needs "http" and "json" treesitter grammars too
|
||||
rest-nvim = super.rest-nvim.overrideAttrs (old: {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
});
|
||||
|
||||
skim = buildVimPluginFrom2Nix {
|
||||
pname = "skim";
|
||||
version = skim.version;
|
||||
|
|
|
@ -563,6 +563,7 @@ norcalli/nvim-colorizer.lua
|
|||
norcalli/nvim-terminal.lua
|
||||
norcalli/snippets.nvim
|
||||
NTBBloodbath/galaxyline.nvim
|
||||
NTBBloodbath/rest.nvim
|
||||
ntpeters/vim-better-whitespace
|
||||
numirias/semshi
|
||||
numtostr/comment.nvim
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xf86-input-wacom";
|
||||
version = "0.40.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxwacom";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-0U4pAB5vsIlBewCBqQ4SLHDrwqtr9nh7knZpXZMkzck=";
|
||||
sha256 = "sha256-WitvT1y9KpXJriMr6Z9CrmAQdKPBZ5g9fP2nIgzJzAc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
@ -15,13 +15,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janus-gateway";
|
||||
version = "0.11.7";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meetecho";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7Q/mbY3Sh2Hl1iXDN/ZM3sLz0FCsYdT8QxiyCQC2qN0=";
|
||||
sha256 = "sha256-otTIDwcbF8Rcas048Vkn30v39GYIYbAIY72ipJhIwC4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
|
||||
|
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mycorrhiza";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bouncepaw";
|
||||
repo = "mycorrhiza";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dd18n9lq4wxz7kn1szavigw9098r7rcwz9j53q92mx100fa42q6";
|
||||
sha256 = "sha256-81Ok/0cDkFqKEAwWtpxM3InMfu0R9rZJzQ41AhWuVuo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1s7n0lk3cr4lkay3plvlqfpx2gh03n2afb43gv9lmwljbry9zbss";
|
||||
vendorSha256 = "sha256-9FMxj3AkbKyUMZWj1S0myoKem4mupOHPIfxNHjYk8mU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector-contrib";
|
||||
version = "0.43.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ktzP+ugG2sa0v8B1Zp47o8Bmpxv98zQyFyWf9QfQRoQ=";
|
||||
sha256 = "sha256-JRkS51ybFnvCn3pKhDeXO0R23wzT1uso1PtXZllF1fA=";
|
||||
};
|
||||
# proxy vendor to avoid hash missmatches between linux and macOS
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-0E52YSWlq1ebHA3kR9Qo/6ufug9R+z1cSD9AfbN/Mi0=";
|
||||
vendorSha256 = "sha256-4MnUDakBfo3nhSqMjDYiqx6FNZvAB/9DE1yxOvmQAAk=";
|
||||
|
||||
subPackages = [ "cmd/otelcontribcol" ];
|
||||
|
||||
|
|
|
@ -12,17 +12,17 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hYhJv5LbebUA9Sp8/admfKWXBoOVvXdr3Mzc3qG8GlM=";
|
||||
sha256 = "sha256-8BfnxiBBql4X4veUzSV8oo2Wakt5hENz4aYcOemFtbw=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcorecol";
|
||||
vendorSha256 = "sha256-w5uyAVZ1TrurD4CEWTTk1fWmdlQn8eAFWZrNpISB5Rk=";
|
||||
vendorSha256 = "sha256-0A0PKmmbg11f3ilf/3bh0sVtHlZXgn72LQv4CRCu/VQ=";
|
||||
|
||||
preBuild = ''
|
||||
# set the build version, can't be done via ldflags
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "topicctl";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "segmentio";
|
||||
repo = "topicctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs=";
|
||||
sha256 = "sha256-hbsVk82iTZGVvypZHhUk/By0sSQxmZQBog2/3qKE94s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-X6iVbljbHb9nBoXAZuy+vG8w7Alct+8BkabZlJeuUAM=";
|
||||
vendorSha256 = "sha256-i1ir/aT/jaK//rmH9k/eK4LIRh0OmEytc0mGO7IrpqI=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.BuildVersion=${version}"
|
||||
|
|
|
@ -1,26 +1,41 @@
|
|||
{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh, nixosTests }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonApplication
|
||||
, pexpect
|
||||
, pyyaml
|
||||
, openssh
|
||||
, nixosTests
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonApplication rec{
|
||||
pname = "xxh";
|
||||
version = "0.8.8";
|
||||
version = "0.8.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TzC8GTDmnYN56Rp5DyZxh+yGrkgWr6Xt86a/jyB3j5k=";
|
||||
hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pexpect pyyaml openssh ];
|
||||
propagatedBuildInputs = [
|
||||
pexpect
|
||||
pyyaml
|
||||
openssh
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) xxh;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bring your favorite shell wherever you go through ssh";
|
||||
description = "Bring your favorite shell wherever you go through SSH";
|
||||
homepage = "https://github.com/xxh/xxh";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.pasqui23 ];
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alejandra";
|
||||
version = "unstable-2022-02-12";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamadorueda";
|
||||
repo = "alejandra";
|
||||
rev = "bfda2490bcb6f7dab2d15f033f65441af283d48d";
|
||||
hash = "sha256-D7dCtwwQcrSnC7MjoqB0ogCsCmrthqy+TqbqbJUT6zE=";
|
||||
rev = version;
|
||||
hash = "sha256-jj66PRqXASDNzdidkdfF2ezWM45Pw9Z+G4YNe8HRPhU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Gos0ku4wR0jP1FQLYBVMqZN4qW0Tx45qpIL99s6a+t8=";
|
||||
cargoSha256 = "sha256-701lWa/2u10vCSRplL1ebYz29DxjpHY0SqjSWme1X1U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Uncompromising Nix Code Formatter";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nfpm";
|
||||
version = "2.12.2";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IAu5JC6kEmL4S9nhR++YhpjgH0lIETYsJfOwN0l/LKU=";
|
||||
sha256 = "sha256-7wEwTw/CMKS9K377oXfGkJoRnAmBLjvZTNZzRMorWEM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Zva63fK465y7FVtBEPDo9CRIq17f09eYsZQBWDht6mg=";
|
||||
vendorSha256 = "sha256-VzkfqIWkcMwQeGzisw7JBQyTNVz+m7wF6N65MtOFyEc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,27 +1,34 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotop";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xxxserxxx";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy";
|
||||
hash = "sha256-oDM+dpAT1vDpp2NkD669hwbgw7HWJGFqhsql9PvbxSk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-WwHaprq4+4uduiKpNu5iVcV6qJsYX/aSXJAJWpbDVqc=";
|
||||
vendorSha256 = "sha256-WGLcpF1NqVQDiU3M9rQ555ZW3sDC3Szch+skTZgt0xg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/gotop --create-manpage > gotop.1
|
||||
installManPage gotop.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal based graphical activity monitor inspired by gtop and vtop";
|
||||
homepage = "https://github.com/xxxserxxx/gotop";
|
||||
|
|
|
@ -1337,7 +1337,7 @@ with pkgs;
|
|||
|
||||
ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { };
|
||||
|
||||
archivebox = python3Packages.callPackage ../applications/misc/archivebox { };
|
||||
archivebox = callPackage ../applications/misc/archivebox { };
|
||||
|
||||
archivemount = callPackage ../tools/filesystems/archivemount { };
|
||||
|
||||
|
@ -6074,7 +6074,7 @@ with pkgs;
|
|||
|
||||
google-fonts = callPackage ../data/fonts/google-fonts { };
|
||||
|
||||
google-clasp = callPackage ../development/misc/google-clasp { };
|
||||
google-clasp = nodePackages."@google/clasp";
|
||||
|
||||
google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine;
|
||||
|
||||
|
@ -8936,6 +8936,8 @@ with pkgs;
|
|||
|
||||
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
|
||||
|
||||
podman-tui = callPackage ../applications/virtualization/podman-tui { };
|
||||
|
||||
pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
|
||||
|
||||
poedit = callPackage ../tools/text/poedit {
|
||||
|
|
|
@ -71,6 +71,7 @@ mapAliases ({
|
|||
jupyter_client = jupyter-client; # added 2021-10-15
|
||||
Keras = keras; # added 2021-11-25
|
||||
lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
|
||||
Markups = markups; # added 2022-02-14
|
||||
MechanicalSoup = mechanicalsoup; # added 2021-06-01
|
||||
pam = python-pam; # added 2020-09-07.
|
||||
PasteDeploy = pastedeploy; # added 2021-10-07
|
||||
|
|
|
@ -298,6 +298,8 @@ in {
|
|||
|
||||
aiohttp = callPackage ../development/python-modules/aiohttp { };
|
||||
|
||||
aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };
|
||||
|
||||
aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
|
||||
|
||||
aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
|
||||
|
@ -4889,7 +4891,7 @@ in {
|
|||
|
||||
markupsafe = callPackage ../development/python-modules/markupsafe { };
|
||||
|
||||
Markups = callPackage ../development/python-modules/Markups { };
|
||||
markups = callPackage ../development/python-modules/markups { };
|
||||
|
||||
marshmallow = callPackage ../development/python-modules/marshmallow { };
|
||||
|
||||
|
@ -9728,6 +9730,8 @@ in {
|
|||
|
||||
textfsm = callPackage ../development/python-modules/textfsm { };
|
||||
|
||||
textile = callPackage ../development/python-modules/textile { };
|
||||
|
||||
testing-common-database = callPackage ../development/python-modules/testing-common-database { };
|
||||
|
||||
testing-postgresql = callPackage ../development/python-modules/testing-postgresql { };
|
||||
|
|
Loading…
Reference in a new issue