Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8d32772702
@ -50,7 +50,7 @@ let
|
||||
# to install it because it would create a cyclic dependency between
|
||||
# the outputs. We also need to enable the remote,
|
||||
# which should not be done by default.
|
||||
mkIf cfg.enableTestRemote (enableRemote cfg.package.installedTests "fwupd-tests")
|
||||
if cfg.enableTestRemote then (enableRemote cfg.package.installedTests "fwupd-tests") else {}
|
||||
);
|
||||
|
||||
in {
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eclair";
|
||||
version = "0.6.2";
|
||||
revision = "6817d6f";
|
||||
version = "0.7.0-patch-disconnect";
|
||||
revision = "cad88bf";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip";
|
||||
sha256 = "038r9mblm2r8mkxnv65k29r7xj22dff5gmvzv9xiy5zf9i45mmk8";
|
||||
hash = "sha256-agOxflCXfoeSeGliB/PAMMyCdqYYajciHMfLrSiZx1Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jq openjdk11 ];
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.15.1-beta";
|
||||
version = "0.15.2-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E1RxFy7eRCTnzTg2B0llRt+r41K6V4VQH7Edh1As4cY=";
|
||||
sha256 = "sha256-C7BZ6awY2v5Uvvh12YEosoEQyJoetWzH/1wIQSVjtEk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-e72HIsS1fftJEOvjr1RQMo3+gjlBxXPHq2olGWfurJk=";
|
||||
vendorSha256 = "sha256-rCdcPkgrFcDfLfF8wipFws7YTKEgotuVqVIJYLMOxbs=";
|
||||
|
||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
{ appimageTools
|
||||
, fetchurl
|
||||
, lib
|
||||
}:
|
||||
|
||||
# You can debug this package with: $ ELECTRON_ENABLE_LOGGING=true timedoctor
|
||||
let
|
||||
version = "3.12.12";
|
||||
sha256 = "01j149c6lacgysll3sajxlb43m1al08kdcwc6zyzw80nrp4iagf6";
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
name = "timedoctor-${version}";
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage";
|
||||
};
|
||||
multiPkgs = _: with _; [
|
||||
alsa-lib
|
||||
atk
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
cairo
|
||||
coreutils
|
||||
cups
|
||||
dbus
|
||||
dbus.lib
|
||||
desktop-file-utils
|
||||
expat
|
||||
expat.dev
|
||||
file
|
||||
freetype
|
||||
gcc
|
||||
gcc-unwrapped.lib
|
||||
gdb
|
||||
gdk-pixbuf
|
||||
git
|
||||
glib
|
||||
glibc
|
||||
gdk-pixbuf
|
||||
gtk3
|
||||
gtk3.dev
|
||||
gnome.zenity
|
||||
gnome2.GConf
|
||||
gnumake
|
||||
gnutar
|
||||
gpsd
|
||||
gtk3
|
||||
gtk3.dev
|
||||
gtk3-x11
|
||||
gtk3-x11.dev
|
||||
plasma5Packages.kdialog
|
||||
libappindicator-gtk2.out
|
||||
libexif
|
||||
(libjpeg.override { enableJpeg8 = true; }).out
|
||||
libnotify
|
||||
libpng
|
||||
libxml2
|
||||
libxslt
|
||||
netcat
|
||||
nettools
|
||||
nodePackages.asar
|
||||
nspr
|
||||
nss
|
||||
openjdk
|
||||
pango
|
||||
patchelf
|
||||
python38
|
||||
strace
|
||||
sqlite
|
||||
sqlite.dev
|
||||
udev
|
||||
unzip
|
||||
util-linux
|
||||
watch
|
||||
wget
|
||||
which
|
||||
wrapGAppsHook
|
||||
xdg-utils
|
||||
xorg.libX11
|
||||
xorg.libXau
|
||||
xorg.libXaw
|
||||
xorg.libXaw3d
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXdmcp
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXfont
|
||||
xorg.libXfont2
|
||||
xorg.libXft
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXmu
|
||||
xorg.libXp
|
||||
xorg.libXpm
|
||||
xorg.libXpresent
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXres
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXt
|
||||
xorg.libXTrap
|
||||
xorg.libXtst
|
||||
xorg.libXv
|
||||
xorg.libXvMC
|
||||
xorg.libXxf86dga
|
||||
xorg.libXxf86misc
|
||||
xorg.libXxf86vm
|
||||
xorg.xcbutilkeysyms
|
||||
zip
|
||||
zlib
|
||||
zsh
|
||||
];
|
||||
meta = with lib; {
|
||||
description = "Employee time tracking software";
|
||||
homepage = "https://www.timedoctor.com";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ dsalaza4 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
# gpgme for i686-linux failed to build.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mate-tweak";
|
||||
version = "22.04.8";
|
||||
version = "22.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu-mate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "eaOEe/tvpDBBPVuZhSWWLZBXXjqt05ukGLUmVMY1hZU=";
|
||||
sha256 = "emeNgCzMhHMeLOyUkXe+8OzQMEWuwNdD4xkGXIFgbh4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,10 +9,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-datetime-plugin";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
rev-prefix = "xfce4-datetime-plugin-";
|
||||
sha256 = "sha256-qmZit7cCGnVTzdzPTiAiruBWlMLWzZEXJtFqAesaARo=";
|
||||
sha256 = "sha256-ov4Wh9Pj01u0NrjDn5p+qXlD2LY3gEUC1e/jPjkn4xQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jasmin-compiler";
|
||||
version = "2022.04.0";
|
||||
version = "2022.09.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
|
||||
sha256 = "sha256:0yf3lp469m8jdpqmqq3sw3h8l3psrzdp134wp3l1q31j3akskn2s";
|
||||
sha256 = "sha256-QiOnDhh1VI5c6AZ4/uwLdGBkP76HxN4cfnPJD4R2hlA=";
|
||||
};
|
||||
|
||||
sourceRoot = "jasmin-compiler-v${version}/compiler";
|
||||
|
||||
@ -8,11 +8,11 @@ buildDunePackage rec {
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
pname = "x509";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz";
|
||||
sha256 = "sha256:159mhfwsiv08sj0zk7s3k813f0mc9vpziwpf6j9r32y3nizp59k7";
|
||||
sha256 = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I=";
|
||||
};
|
||||
|
||||
checkInputs = [ alcotest cstruct-unix ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.19.14";
|
||||
version = "0.19.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GGYGIzjlFbRxT56UBHSvWEea5EAxVl0JO2nBK9WWLZk=";
|
||||
hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
# Poetry2nix version
|
||||
version = "1.33.0";
|
||||
version = "1.34.1";
|
||||
|
||||
inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet;
|
||||
|
||||
@ -27,6 +27,7 @@ let
|
||||
, attrs
|
||||
, includeBuildSystem ? true
|
||||
, groups ? [ ]
|
||||
, checkGroups ? [ "dev" ]
|
||||
}:
|
||||
let
|
||||
getInputs = attr: attrs.${attr} or [ ];
|
||||
@ -73,7 +74,8 @@ let
|
||||
nativeBuildInputs = mkInput "nativeBuildInputs" [ ];
|
||||
checkInputs = mkInput "checkInputs" (
|
||||
getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # <poetry-1.2.0
|
||||
++ getDeps (pyProject.tool.poetry.group."dev".dependencies or { }) # >=poetry-1.2.0
|
||||
# >=poetry-1.2.0 dependency groups
|
||||
++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups)
|
||||
);
|
||||
};
|
||||
|
||||
@ -131,6 +133,7 @@ lib.makeScope pkgs.newScope (self: {
|
||||
, editablePackageSources ? { }
|
||||
, pyProject ? readTOML pyproject
|
||||
, groups ? [ ]
|
||||
, checkGroups ? [ "dev" ]
|
||||
}:
|
||||
let
|
||||
/* The default list of poetry2nix override overlays */
|
||||
@ -182,23 +185,17 @@ lib.makeScope pkgs.newScope (self: {
|
||||
builtins.map
|
||||
(
|
||||
pkgMeta:
|
||||
if builtins.elem pkgMeta.name nixpkgsBuildSystems then {
|
||||
name = pkgMeta.name;
|
||||
value = super."${pkgMeta.name}";
|
||||
} else rec {
|
||||
name = normalizePackageName pkgMeta.name;
|
||||
let normalizedName = normalizePackageName pkgMeta.name; in
|
||||
{
|
||||
name = normalizedName;
|
||||
value = self.mkPoetryDep (
|
||||
pkgMeta // {
|
||||
inherit pwd preferWheels;
|
||||
source = pkgMeta.source or null;
|
||||
files = lockFiles.${name};
|
||||
files = lockFiles.${normalizedName};
|
||||
pythonPackages = self;
|
||||
|
||||
sourceSpec =
|
||||
let
|
||||
normalizedName = normalizePackageName pkgMeta.name;
|
||||
in
|
||||
(
|
||||
sourceSpec = (
|
||||
(normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName}
|
||||
or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName}
|
||||
or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies { }).${normalizedName} # Poetry 1.2.0+
|
||||
@ -210,8 +207,9 @@ lib.makeScope pkgs.newScope (self: {
|
||||
)
|
||||
(lib.reverseList compatible)
|
||||
);
|
||||
buildSystems = builtins.listToAttrs (builtins.map (x: { name = x; value = super.${x}; }) nixpkgsBuildSystems);
|
||||
in
|
||||
lockPkgs // {
|
||||
lockPkgs // buildSystems // {
|
||||
# Create a dummy null package for the current project in case any dependencies depend on the root project (issue #307)
|
||||
${pyProject.tool.poetry.name} = null;
|
||||
};
|
||||
@ -262,7 +260,7 @@ lib.makeScope pkgs.newScope (self: {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays;
|
||||
py = python.override { inherit packageOverrides; self = py; };
|
||||
|
||||
inputAttrs = mkInputAttrs { inherit py pyProject groups; attrs = { }; includeBuildSystem = false; };
|
||||
inputAttrs = mkInputAttrs { inherit py pyProject groups checkGroups; attrs = { }; includeBuildSystem = false; };
|
||||
|
||||
requiredPythonModules = python.pkgs.requiredPythonModules;
|
||||
/* Include all the nested dependencies which are required for each package.
|
||||
@ -364,11 +362,12 @@ lib.makeScope pkgs.newScope (self: {
|
||||
, pwd ? projectDir
|
||||
, preferWheels ? false
|
||||
, groups ? [ ]
|
||||
, checkGroups ? [ "dev" ]
|
||||
, ...
|
||||
}@attrs:
|
||||
let
|
||||
poetryPython = self.mkPoetryPackages {
|
||||
inherit pyproject poetrylock overrides python pwd preferWheels groups;
|
||||
inherit pyproject poetrylock overrides python pwd preferWheels groups checkGroups;
|
||||
};
|
||||
py = poetryPython.python;
|
||||
|
||||
@ -383,7 +382,7 @@ lib.makeScope pkgs.newScope (self: {
|
||||
];
|
||||
passedAttrs = builtins.removeAttrs attrs specialAttrs;
|
||||
|
||||
inputAttrs = mkInputAttrs { inherit py pyProject attrs groups; };
|
||||
inputAttrs = mkInputAttrs { inherit py pyProject attrs groups checkGroups; };
|
||||
|
||||
app = py.pkgs.buildPythonPackage (
|
||||
passedAttrs // inputAttrs // {
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"flitBuildHook",
|
||||
"cython",
|
||||
"hatchling",
|
||||
"hatch-vcs",
|
||||
"setuptools",
|
||||
"setuptools-scm"
|
||||
]
|
||||
|
||||
@ -790,6 +790,7 @@
|
||||
"setuptools"
|
||||
],
|
||||
"apipkg": [
|
||||
"hatch-vcs",
|
||||
"hatchling",
|
||||
"setuptools"
|
||||
],
|
||||
@ -1918,8 +1919,12 @@
|
||||
],
|
||||
"black": [
|
||||
{
|
||||
"buildSystem": "hatch-fancy-pypi-readme",
|
||||
"from": "22.10.0"
|
||||
"buildSystem": "setuptools",
|
||||
"until": "22.10.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "setuptools-scm",
|
||||
"until": "22.10.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "hatchling",
|
||||
@ -1929,12 +1934,17 @@
|
||||
"buildSystem": "hatch-vcs",
|
||||
"from": "22.10.0"
|
||||
},
|
||||
"setuptools",
|
||||
"setuptools-scm"
|
||||
{
|
||||
"buildSystem": "hatch-fancy-pypi-readme",
|
||||
"from": "22.10.0"
|
||||
}
|
||||
],
|
||||
"black-macchiato": [
|
||||
"setuptools"
|
||||
],
|
||||
"blacken-docs": [
|
||||
"setuptools"
|
||||
],
|
||||
"bleach": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -3367,7 +3377,8 @@
|
||||
"setuptools"
|
||||
],
|
||||
"dbus-fast": [
|
||||
"poetry-core"
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
],
|
||||
"dbus-next": [
|
||||
"setuptools"
|
||||
@ -3977,6 +3988,10 @@
|
||||
"setuptools-scm"
|
||||
],
|
||||
"docformatter": [
|
||||
{
|
||||
"buildSystem": "poetry-core",
|
||||
"from": "1.5.0"
|
||||
},
|
||||
"setuptools"
|
||||
],
|
||||
"docker": [
|
||||
@ -4452,6 +4467,9 @@
|
||||
"eradicate": [
|
||||
"setuptools"
|
||||
],
|
||||
"erppeek": [
|
||||
"setuptools"
|
||||
],
|
||||
"escapism": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -4664,7 +4682,8 @@
|
||||
],
|
||||
"fastapi-mail": [
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
"setuptools",
|
||||
"hatchling"
|
||||
],
|
||||
"fastapi-restful": [
|
||||
"poetry"
|
||||
@ -6861,6 +6880,9 @@
|
||||
"itemloaders": [
|
||||
"setuptools"
|
||||
],
|
||||
"iteration-utilities": [
|
||||
"setuptools"
|
||||
],
|
||||
"itsdangerous": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -6989,6 +7011,9 @@
|
||||
"jinja2": [
|
||||
"setuptools"
|
||||
],
|
||||
"jinja2-ansible-filters": [
|
||||
"setuptools"
|
||||
],
|
||||
"jinja2-git": [
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
@ -7198,7 +7223,14 @@
|
||||
"setuptools"
|
||||
],
|
||||
"jupyter-core": [
|
||||
"setuptools"
|
||||
{
|
||||
"buildSystem": "hatchling",
|
||||
"from": "4.11.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "setuptools",
|
||||
"until": "4.11.0"
|
||||
}
|
||||
],
|
||||
"jupyter-lsp": [
|
||||
"setuptools"
|
||||
@ -7958,6 +7990,9 @@
|
||||
"manhole": [
|
||||
"setuptools"
|
||||
],
|
||||
"manage-fastapi": [
|
||||
"poetry"
|
||||
],
|
||||
"manimpango": [
|
||||
"cython",
|
||||
"setuptools"
|
||||
@ -8243,6 +8278,9 @@
|
||||
"migen": [
|
||||
"setuptools"
|
||||
],
|
||||
"mike": [
|
||||
"setuptools"
|
||||
],
|
||||
"milc": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8326,6 +8364,9 @@
|
||||
"mkdocs-gen-files": [
|
||||
"poetry"
|
||||
],
|
||||
"mkdocs-git-revision-date-localized-plugin": [
|
||||
"setuptools"
|
||||
],
|
||||
"mkdocs-gitlab": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8339,6 +8380,9 @@
|
||||
"mkdocs-macros": [
|
||||
"setuptools"
|
||||
],
|
||||
"mkdocs-macros-plugin": [
|
||||
"setuptools"
|
||||
],
|
||||
"mkdocs-material": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8354,6 +8398,9 @@
|
||||
"mkdocs-swagger-ui-tag": [
|
||||
"setuptools"
|
||||
],
|
||||
"mkdocs-table-reader-plugin": [
|
||||
"setuptools"
|
||||
],
|
||||
"mkdocstrings": [
|
||||
"pdm-pep517",
|
||||
"setuptools"
|
||||
@ -8661,6 +8708,9 @@
|
||||
"poetry-core",
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-boto3-cognito": [
|
||||
"setuptools"
|
||||
],
|
||||
"mypy-boto3-cognito-idp": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -8774,15 +8824,37 @@
|
||||
"setuptools"
|
||||
],
|
||||
"nbconvert": [
|
||||
"setuptools"
|
||||
{
|
||||
"buildSystem": "setuptools",
|
||||
"until": "7.0.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "hatchling",
|
||||
"from": "7.0.0"
|
||||
}
|
||||
],
|
||||
"nbdime": [
|
||||
"setuptools",
|
||||
"setuptools-scm"
|
||||
],
|
||||
"nbformat": [
|
||||
"flit-core",
|
||||
"setuptools"
|
||||
{
|
||||
"buildSystem": "setuptools",
|
||||
"until": "5.4.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "flit-core",
|
||||
"from": "5.4.0",
|
||||
"until": "5.6.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "hatchling",
|
||||
"from": "5.6.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "hatch-nodejs-version",
|
||||
"from": "5.6.0"
|
||||
}
|
||||
],
|
||||
"nbmerge": [
|
||||
"setuptools"
|
||||
@ -10084,6 +10156,7 @@
|
||||
"setuptools"
|
||||
],
|
||||
"pipdeptree": [
|
||||
"hatch-vcs",
|
||||
"hatchling",
|
||||
"setuptools"
|
||||
],
|
||||
@ -10363,9 +10436,15 @@
|
||||
"prayer-times-calculator": [
|
||||
"setuptools"
|
||||
],
|
||||
"pre-commit": [
|
||||
"setuptools"
|
||||
],
|
||||
"pre-commit-hooks": [
|
||||
"setuptools"
|
||||
],
|
||||
"pre-commit-po-hooks": [
|
||||
"setuptools"
|
||||
],
|
||||
"precis-i18n": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -11058,6 +11137,9 @@
|
||||
"pydeps": [
|
||||
"setuptools"
|
||||
],
|
||||
"pydeprecate": [
|
||||
"setuptools"
|
||||
],
|
||||
"pydes": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -11389,6 +11471,7 @@
|
||||
"setuptools"
|
||||
],
|
||||
"pyhamcrest": [
|
||||
"hatch-vcs",
|
||||
"hatchling",
|
||||
"setuptools"
|
||||
],
|
||||
@ -13718,6 +13801,9 @@
|
||||
"flit-core",
|
||||
"setuptools"
|
||||
],
|
||||
"pyyaml-include": [
|
||||
"setuptools"
|
||||
],
|
||||
"pyzbar": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -13725,6 +13811,7 @@
|
||||
"setuptools"
|
||||
],
|
||||
"pyzmq": [
|
||||
"packaging",
|
||||
"setuptools"
|
||||
],
|
||||
"pyzufall": [
|
||||
@ -14676,8 +14763,14 @@
|
||||
"setuptools"
|
||||
],
|
||||
"seaborn": [
|
||||
"flit-core",
|
||||
"setuptools"
|
||||
{
|
||||
"buildSystem": "setuptools",
|
||||
"until": "0.12.0"
|
||||
},
|
||||
{
|
||||
"buildSystem": "flit-core",
|
||||
"from": "0.12.0"
|
||||
}
|
||||
],
|
||||
"seabreeze": [
|
||||
"cython",
|
||||
@ -16653,6 +16746,9 @@
|
||||
"types-colorama": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-cryptography": [
|
||||
"setuptools"
|
||||
],
|
||||
"types-dateutil": [
|
||||
"setuptools"
|
||||
],
|
||||
@ -17048,6 +17144,7 @@
|
||||
"setuptools-scm"
|
||||
],
|
||||
"vector": [
|
||||
"hatch-vcs",
|
||||
"hatchling"
|
||||
],
|
||||
"vega": [
|
||||
@ -17087,6 +17184,9 @@
|
||||
"versiontools": [
|
||||
"setuptools"
|
||||
],
|
||||
"verspec": [
|
||||
"setuptools"
|
||||
],
|
||||
"vertica-python": [
|
||||
"setuptools"
|
||||
],
|
||||
|
||||
@ -130,9 +130,21 @@ lib.composeManyExtensions [
|
||||
self.dopy
|
||||
self.ncclient
|
||||
];
|
||||
} // lib.optionalAttrs (lib.versionOlder old.version "5.0") {
|
||||
prePatch = pkgs.python.pkgs.ansible.prePatch or "";
|
||||
postInstall = pkgs.python.pkgs.ansible.postInstall or "";
|
||||
}
|
||||
);
|
||||
|
||||
ansible-base = super.ansible-base.overridePythonAttrs (
|
||||
old:
|
||||
{
|
||||
prePatch = ''sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py'';
|
||||
postInstall = ''
|
||||
for m in docs/man/man1/*; do
|
||||
install -vD $m -t $out/share/man/man1
|
||||
done
|
||||
'';
|
||||
}
|
||||
// lib.optionalAttrs (lib.versionOlder old.version "2.4") {
|
||||
prePatch = ''sed -i "s,/usr/,$out," lib/ansible/constants.py'';
|
||||
}
|
||||
);
|
||||
|
||||
@ -194,7 +206,6 @@ lib.composeManyExtensions [
|
||||
}.${version} or (
|
||||
lib.warn "Unknown bcrypt version: '${version}'. Please update getCargoHash." lib.fakeHash
|
||||
);
|
||||
sha256 = getCargoHash super.bcrypt.version;
|
||||
in
|
||||
super.bcrypt.overridePythonAttrs (
|
||||
old: {
|
||||
@ -206,7 +217,7 @@ lib.composeManyExtensions [
|
||||
(old.nativeBuildInputs or [ ])
|
||||
++ lib.optionals (lib.versionAtLeast old.version "4")
|
||||
(with pkgs.rustPlatform; [ rust.rustc rust.cargo cargoSetupHook self.setuptools-rust ]);
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "4") rec {
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "4") {
|
||||
cargoDeps =
|
||||
pkgs.rustPlatform.fetchCargoTarball
|
||||
{
|
||||
@ -269,6 +280,10 @@ lib.composeManyExtensions [
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
|
||||
});
|
||||
|
||||
cerberus = super.cerberus.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
|
||||
});
|
||||
|
||||
cssselect2 = super.cssselect2.overridePythonAttrs (
|
||||
old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
|
||||
@ -341,6 +356,10 @@ lib.composeManyExtensions [
|
||||
}
|
||||
);
|
||||
|
||||
copier = super.copier.overrideAttrs (old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.git ];
|
||||
});
|
||||
|
||||
cryptography =
|
||||
let
|
||||
getCargoHash = version: {
|
||||
@ -355,8 +374,9 @@ lib.composeManyExtensions [
|
||||
lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash
|
||||
);
|
||||
sha256 = getCargoHash super.cryptography.version;
|
||||
isWheel = lib.hasSuffix ".whl" super.cryptography.src;
|
||||
scrypto =
|
||||
if lib.versionAtLeast super.cryptography.version "35" && sha256 == null then
|
||||
if isWheel then
|
||||
(
|
||||
super.cryptography.override { preferWheel = true; }
|
||||
) else super.cryptography;
|
||||
@ -367,7 +387,7 @@ lib.composeManyExtensions [
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ])
|
||||
++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
|
||||
++ lib.optional (!self.isPyPy) pyBuildPackages.cffi
|
||||
++ lib.optional (lib.versionAtLeast old.version "3.5")
|
||||
++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel)
|
||||
(with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
|
||||
buildInputs = (old.buildInputs or [ ])
|
||||
++ [ (if lib.versionAtLeast old.version "37" then pkgs.openssl_3 else pkgs.openssl_1_1) ]
|
||||
@ -375,7 +395,7 @@ lib.composeManyExtensions [
|
||||
propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ];
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
|
||||
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "35" && sha256 != null) rec {
|
||||
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.5" && !isWheel) rec {
|
||||
cargoDeps =
|
||||
pkgs.rustPlatform.fetchCargoTarball {
|
||||
src = old.src;
|
||||
@ -806,6 +826,12 @@ lib.composeManyExtensions [
|
||||
}
|
||||
);
|
||||
|
||||
ipython = super.ipython.overridePythonAttrs (
|
||||
old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
|
||||
}
|
||||
);
|
||||
|
||||
isort = super.isort.overridePythonAttrs (
|
||||
old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
|
||||
@ -884,7 +910,7 @@ lib.composeManyExtensions [
|
||||
);
|
||||
|
||||
jupyter-packaging = super.jupyter-packaging.overridePythonAttrs (old: {
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.wheel ];
|
||||
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools self.wheel ];
|
||||
});
|
||||
|
||||
jupyterlab-widgets = super.jupyterlab-widgets.overridePythonAttrs (
|
||||
@ -1059,6 +1085,9 @@ lib.composeManyExtensions [
|
||||
self.setuptools-scm-git-archive
|
||||
];
|
||||
|
||||
# Clang doesn't understand -fno-strict-overflow, and matplotlib builds with -Werror
|
||||
hardeningDisable = if stdenv.isDarwin then [ "strictoverflow" ] else [ ];
|
||||
|
||||
passthru = old.passthru or { } // passthru;
|
||||
|
||||
MPLSETUPCFG = pkgs.writeText "mplsetup.cfg" (lib.generators.toINI { } passthru.config);
|
||||
@ -1251,6 +1280,8 @@ lib.composeManyExtensions [
|
||||
};
|
||||
in
|
||||
{
|
||||
# fails to build with format=pyproject and setuptools >= 65
|
||||
format = if (old.format == "poetry2nix") then "setuptools" else old.format;
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ];
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ blas ];
|
||||
enableParallelBuilding = true;
|
||||
@ -1271,9 +1302,10 @@ lib.composeManyExtensions [
|
||||
);
|
||||
|
||||
open3d = super.open3d.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ (with pkgs; [
|
||||
udev
|
||||
]);
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [
|
||||
pkgs.udev
|
||||
pkgs.libusb1
|
||||
];
|
||||
# TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support.
|
||||
autoPatchelfIgnoreMissingDeps = true;
|
||||
});
|
||||
@ -1441,8 +1473,6 @@ lib.composeManyExtensions [
|
||||
{
|
||||
# "Vendor" dependencies (for build-system support)
|
||||
postPatch = ''
|
||||
find .
|
||||
|
||||
echo "import sys" >> ${initFile}
|
||||
for path in $propagatedBuildInputs; do
|
||||
echo "sys.path.insert(0, \"$path\")" >> ${initFile}
|
||||
@ -1715,6 +1745,10 @@ lib.composeManyExtensions [
|
||||
}
|
||||
);
|
||||
|
||||
pyrealsense2 = super.pyrealsense2.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libusb1.out ];
|
||||
});
|
||||
|
||||
pyrfr = super.pyrfr.overridePythonAttrs (old: {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ];
|
||||
});
|
||||
@ -2271,6 +2305,43 @@ lib.composeManyExtensions [
|
||||
}).wheel;
|
||||
};
|
||||
|
||||
watchfiles =
|
||||
let
|
||||
# Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0
|
||||
getRepoHash = version: {
|
||||
"0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx";
|
||||
"0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a";
|
||||
"0.15.0" = "14k3avrj7v794kk4mk2xggn40a4s0zg8iq8wmyyyrf7va6hz29hf";
|
||||
"0.14.1" = "1pgfbhxrvr3dw46x9piqj3ydxgn4lkrfp931q0cajinrpv4acfay";
|
||||
"0.14" = "0lml67ilyly0i632pffdy1gd07404vx90xnkw8q6wf6xp5afmkka";
|
||||
"0.13" = "0rkz8yr01mmxm2lcmbnr9i5c7n371mksij7v3ws0aqlrh3kgww02";
|
||||
"0.12" = "16788a0d8n1bb705f0k3dvav2fmbbl6pcikwpgarl1l3fcfff8kl";
|
||||
"0.11" = "0vx56h9wfxj7x3aq7jign4rnlfm7x9nhjwmsv8p22acbzbs10dgv";
|
||||
"0.10" = "0ypdy9sq4211djqh4ni5ap9l7whq9hw0vhsxjfl3a0a4czlldxqp";
|
||||
}.${version};
|
||||
sha256 = getRepoHash super.watchfiles.version;
|
||||
in
|
||||
super.watchfiles.overridePythonAttrs (old: rec {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "samuelcolvin";
|
||||
repo = "watchfiles";
|
||||
rev = "v${old.version}";
|
||||
inherit sha256;
|
||||
};
|
||||
cargoDeps = pkgs.rustPlatform.importCargoLock {
|
||||
lockFile = "${src.out}/Cargo.lock";
|
||||
};
|
||||
buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [
|
||||
pkgs.darwin.apple_sdk.frameworks.Security
|
||||
pkgs.darwin.apple_sdk.frameworks.CoreServices
|
||||
pkgs.libiconv
|
||||
];
|
||||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
|
||||
pkgs.rustPlatform.cargoSetupHook
|
||||
pkgs.rustPlatform.maturinBuildHook
|
||||
];
|
||||
});
|
||||
|
||||
weasyprint = super.weasyprint.overridePythonAttrs (
|
||||
old: {
|
||||
inherit (pkgs.python3.pkgs.weasyprint) patches;
|
||||
@ -2528,6 +2599,12 @@ lib.composeManyExtensions [
|
||||
'root_dirs.extend(jupyter_path())' \
|
||||
'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \
|
||||
--subst-var out
|
||||
'' + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") ''
|
||||
substituteInPlace \
|
||||
./hatch_build.py \
|
||||
--replace \
|
||||
'if self.target_name not in ["wheel", "sdist"]:' \
|
||||
'if True:'
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
||||
@ -3,18 +3,15 @@ let
|
||||
inherit (lib.strings) escapeRegex hasPrefix hasSuffix hasInfix splitString removePrefix removeSuffix;
|
||||
targetMachine = poetryLib.getTargetMachine stdenv;
|
||||
|
||||
# The 'cpxy" as determined by `python.version`
|
||||
#
|
||||
# e.g "2.7.17" -> "cp27"
|
||||
# "3.5.9" -> "cp35"
|
||||
pythonTag =
|
||||
pythonVer =
|
||||
let
|
||||
ver = builtins.splitVersion python.version;
|
||||
major = builtins.elemAt ver 0;
|
||||
minor = builtins.elemAt ver 1;
|
||||
tags = [ "cp" "py" ];
|
||||
in
|
||||
"cp${major}${minor}";
|
||||
abiTag = "${pythonTag}m";
|
||||
{ inherit major minor tags; };
|
||||
abiTag = "cp${pythonVer.major}${pythonVer.minor}m";
|
||||
|
||||
#
|
||||
# Parses wheel file returning an attribute set
|
||||
@ -50,14 +47,24 @@ let
|
||||
then [ ]
|
||||
else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates);
|
||||
|
||||
# pyver = "cpXX"
|
||||
# x = "cpXX" | "py2" | "py3" | "py2.py3"
|
||||
isPyVersionCompatible = pyver: x:
|
||||
isPyVersionCompatible = pyver@{ major, minor, tags }: x:
|
||||
let
|
||||
normalize = y: ''cp${removePrefix "cp" (removePrefix "py" y)}'';
|
||||
isCompat = p: x: hasPrefix (normalize x) p;
|
||||
isCompat = m:
|
||||
builtins.elem m.tag tags
|
||||
&& m.major == major
|
||||
&& builtins.compareVersions minor m.minor >= 0;
|
||||
parseMarker = v:
|
||||
let
|
||||
tag = builtins.substring 0 2 v;
|
||||
major = builtins.substring 2 1 v;
|
||||
end = builtins.substring 3 3 v;
|
||||
minor = if builtins.stringLength end > 0 then end else "0";
|
||||
in
|
||||
lib.lists.any (isCompat pyver) (splitString "." x);
|
||||
{ inherit major minor tag; };
|
||||
markers = splitString "." x;
|
||||
in
|
||||
lib.lists.any isCompat (map parseMarker markers);
|
||||
|
||||
#
|
||||
# Selects the best matching wheel file from a list of files
|
||||
@ -95,7 +102,7 @@ let
|
||||
let
|
||||
f = toWheelAttrs x.file;
|
||||
in
|
||||
(withPython pythonTag abiTag f) && (withPlatforms f);
|
||||
(withPython pythonVer abiTag f) && (withPlatforms f);
|
||||
filtered = builtins.filter filterWheel filesWithoutSources;
|
||||
choose = files:
|
||||
let
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
inherit (drv) src version meta;
|
||||
|
||||
buildInputs = drv.buildInputs ++ drv.propagatedBuildInputs ++ buildInputs;
|
||||
nativeBuildInputs = drv.nativeBuildInputs ++ nativeBuildInputs;
|
||||
nativeBuildInputs = builtins.filter (x: x.name != "python-output-dist-hook") (drv.nativeBuildInputs ++ nativeBuildInputs);
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "symfony-cli";
|
||||
version = "5.4.14";
|
||||
version = "5.4.15";
|
||||
vendorSha256 = "sha256-A0Dq5QoKSFDpif8x27a1O8CGZ9s5PzOycvPfvEp4qn4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XALXgEzVlgUbqatQMBd+blLK9Lt1rJ9+mWEvxhxneIo=";
|
||||
sha256 = "sha256-UESACnwlJjdU1Bm6K9pGNs6p3B/KY71mnlNEfC7ccbc=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swapspace";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tookmund";
|
||||
repo = "Swapspace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v1kSkepZm6+S4wf86ETgQzEAZBLJ2jQBgCRdF7yvuxs=";
|
||||
sha256 = "sha256-tzsw10cpu5hldkm0psWcFnWToWQejout/oGHJais6yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,10 +12,12 @@
|
||||
|
||||
let
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
version = "1.5.0";
|
||||
gitRev = "f4b6a135e2efb18b3a679e3946d4d070a1c45a2c";
|
||||
sha256 = "0irgzw7vwhvm97nmylj44x2dnd8pwf47gvlgw7fj58fj67a0l8fr";
|
||||
cargoSha256 = "18l7yxciqcvagsg9lykilfhr104a4qqdydjkjysxgd197xalxgzr";
|
||||
# It will copy some required files if necessary.
|
||||
# Also don’t forget to run `nix-build -A lorri.tests`
|
||||
version = "1.6.0";
|
||||
gitRev = "1.6.0";
|
||||
sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM=";
|
||||
cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";
|
||||
|
||||
in (rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
|
||||
@ -1154,6 +1154,7 @@ mapAliases ({
|
||||
tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22
|
||||
textadept11 = textadept; # Added 2022-06-07
|
||||
tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22
|
||||
timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09
|
||||
timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2022-09-24
|
||||
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05
|
||||
tkcvs = tkrev; # Added 2022-03-07
|
||||
|
||||
@ -1957,8 +1957,6 @@ with pkgs;
|
||||
|
||||
termsyn = callPackage ../data/fonts/termsyn { };
|
||||
|
||||
timedoctor = callPackage ../applications/office/timedoctor { };
|
||||
|
||||
tvnamer = callPackage ../tools/misc/tvnamer { };
|
||||
|
||||
twine = with python3Packages; toPythonApplication twine;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user