Merge master into staging-next
This commit is contained in:
@@ -75,6 +75,8 @@ in
|
||||
options.services.keyd = {
|
||||
enable = lib.mkEnableOption "keyd, a key remapping daemon";
|
||||
|
||||
package = lib.mkPackageOption pkgs "keyd" { };
|
||||
|
||||
keyboards = lib.mkOption {
|
||||
type = lib.types.attrsOf (lib.types.submodule keyboardOptions);
|
||||
default = { };
|
||||
@@ -138,7 +140,7 @@ in
|
||||
environment.KEYD_SOCKET = "/run/keyd/keyd.sock";
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.keyd}/bin/keyd";
|
||||
ExecStart = lib.getExe' cfg.package "keyd";
|
||||
Restart = "always";
|
||||
|
||||
# TODO investigate why it doesn't work propeprly with DynamicUser
|
||||
|
||||
@@ -571,13 +571,13 @@
|
||||
"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
|
||||
},
|
||||
"hashicorp_google": {
|
||||
"hash": "sha256-ThPUg3hFlaIUTNtikDh45zK6frLudOeTtUwuGAZcVkc=",
|
||||
"hash": "sha256-ylgM8pyE2jqNM/DoABQPB+oGhykL5Qtk2FelzSWh7wQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v7.14.1",
|
||||
"rev": "v7.15.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-H6NjQhSokIMhFAKyirr2LTvgu6/c2p++YYDHO/SLuN8="
|
||||
"vendorHash": "sha256-8VP8ryM4VBpCfsEi7KPiSnCcfLy9xgNFETRdbdTM3Gg="
|
||||
},
|
||||
"hashicorp_google-beta": {
|
||||
"hash": "sha256-BQ5AjO1SrODFyEzM6WTpqUqGURusNRQ/4W4fttoc0Rk=",
|
||||
@@ -815,11 +815,11 @@
|
||||
"vendorHash": "sha256-va9B1CPLLT0NH4VP+1Fjr8O/I2K8xVO9aVjM3fZ9jVE="
|
||||
},
|
||||
"kislerdm_neon": {
|
||||
"hash": "sha256-4icz/nGHIP2nzGbP4iGuPVbn8OC+u13qBSwYbyFLCto=",
|
||||
"hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/kislerdm/neon",
|
||||
"owner": "kislerdm",
|
||||
"repo": "terraform-provider-neon",
|
||||
"rev": "v0.12.0",
|
||||
"rev": "v0.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
|
||||
},
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apx-gui";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vanilla-OS";
|
||||
repo = "apx-gui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nZMbVXeWEgfBsVgX2iESRzDgu0tjiqC1dTCaTlW0iWA=";
|
||||
hash = "sha256-Y2Xrb0+vohfOZTlauk9o4nISwLz6/u87+dXBr3UqwH4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "autotrash";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
@@ -14,13 +14,13 @@ python3Packages.buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bneijt";
|
||||
repo = "autotrash";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"'
|
||||
'';
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
@@ -41,11 +41,11 @@ python3Packages.buildPythonPackage rec {
|
||||
description = "Tool to automatically purge old trashed files";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
homepage = "https://bneijt.nl/pr/autotrash";
|
||||
changelog = "https://github.com/bneijt/autotrash/releases/tag/${version}";
|
||||
changelog = "https://github.com/bneijt/autotrash/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = with lib.maintainers; [
|
||||
sigmanificient
|
||||
mithicspirit
|
||||
];
|
||||
mainProgram = "autotrash";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,21 +11,22 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "aws-sam-cli";
|
||||
version = "1.146.0";
|
||||
version = "1.151.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-sam-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-b0nXhhgQgV0TZ0PGYexKxsb1s7PIe+5dqjOWJiVlWJY=";
|
||||
hash = "sha256-8r/sTb6LYDGuCG46Xuh+glT9LRYR6Q8ErjFL2wPTDLI=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aws-lambda-builders"
|
||||
"aws_lambda_builders"
|
||||
"aws-sam-translator"
|
||||
"boto3"
|
||||
"boto3-stubs"
|
||||
"cfn-lint"
|
||||
"cookiecutter"
|
||||
@@ -134,6 +135,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"tests/unit/cli/test_main.py"
|
||||
"tests/unit/commands/samconfig/test_samconfig.py"
|
||||
"tests/unit/local/docker/test_lambda_image.py"
|
||||
# Tests are failing
|
||||
"tests/unit/commands/local/lib/"
|
||||
"tests/unit/local/lambda_service/test_local_lambda_http_service.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
pkg-config,
|
||||
zlib,
|
||||
openssl,
|
||||
readline,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
neon
|
||||
openssl
|
||||
zlib
|
||||
readline
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cavalcade";
|
||||
version = "0.8";
|
||||
pyproject = true;
|
||||
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "worron";
|
||||
repo = "cavalcade";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VyWOPNidN0+pfuxsgPWq6lI5gXQsiRpmYjQYjZW6i9w=";
|
||||
};
|
||||
|
||||
@@ -71,4 +71,4 @@ python3Packages.buildPythonApplication rec {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cbeams";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
|
||||
disabled = !python3Packages.isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-8Q2sWsAc39Mu34K1wWOKOJERKzBStE4GmtuzOs2T7Kk=";
|
||||
};
|
||||
|
||||
@@ -41,4 +41,4 @@ python3Packages.buildPythonApplication rec {
|
||||
sigmanificient
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "compiledb";
|
||||
version = "0.10.7";
|
||||
pyproject = true;
|
||||
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickdiego";
|
||||
repo = "compiledb";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-toqBf5q1EfZVhZN5DAtxkyFF7UlyNbqxWAIWFMwacxw=";
|
||||
};
|
||||
|
||||
@@ -44,4 +44,4 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://github.com/nickdiego/compiledb";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpp-utilities";
|
||||
version = "5.32.0";
|
||||
version = "5.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "cpp-utilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-NiCUbo00o4rYY0cKwWGz0e2LfJPcRSs1PY6NBlnj9G8=";
|
||||
sha256 = "sha256-Yo4NxISuLgHhQdzJqHdpZvLWuI9c9fNr7okZmZogATM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
diagrams-as-code,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "diagrams-as-code";
|
||||
version = "0.0.4";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmytrostriletskyi";
|
||||
repo = "diagrams-as-code";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0=";
|
||||
};
|
||||
|
||||
@@ -55,4 +55,4 @@ python3Packages.buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "diagrams-as-code";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
gitMinimal,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage (finalAttrs: {
|
||||
pname = "gcovr";
|
||||
version = "8.4";
|
||||
pyproject = true;
|
||||
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gcovr";
|
||||
repo = "gcovr";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v3jNODYD9qa3mwttfuldhhIHrfR5LcsZ+WNWiOWb35E=";
|
||||
};
|
||||
|
||||
@@ -82,9 +82,9 @@ python3Packages.buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python script for summarizing gcov data";
|
||||
homepage = "https://www.gcovr.com/";
|
||||
changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/gcovr/gcovr/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
|
||||
license = lib.licenses.bsd0;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "gcovr";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-copilot-cli";
|
||||
version = "0.0.373";
|
||||
version = "0.0.374";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Mo6RdDEXaLzWCyKPO1Oalc9hO8/gW6x01tpHiFVGiWM=";
|
||||
hash = "sha256-whQbHIAZPzaGgRgnl99qQu0ZIOdl5QspnlydpKlmTjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-sendxmpp";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "mdosch";
|
||||
repo = "go-sendxmpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gZbUSzUfVWJ0cTwKOuPEsynhj0dAXHrpILjpR2NZNWE=";
|
||||
hash = "sha256-uOJ7pI+6ETjb0iRMM3XDeztXHjxNQlU05ODTiBi72LY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GNIfmh6GZYh3vOLrjsgSW0ZWanXZkzBiq0H72RxdOJI=";
|
||||
vendorHash = "sha256-tt70h/JG8t9tbhqJoPu0KPVJ8ZbNKq0h7oLfiPAL4jg=";
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) ejabberd prosody; };
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: rec {
|
||||
pname = "hydra-check";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "hydra-check";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TdMZC/EE52UiJ+gYQZHV4/ReRzMOdCGH+n7pg1vpCCQ=";
|
||||
hash = "sha256-rOqLAI0r11Tfi6crKAxnj/HHBgUKcCGb4MCdxqLv4uE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G9M+1OWp2jlDeSDFagH/YOCdxGQbcru1KFyKEUcMe7g=";
|
||||
cargoHash = "sha256-B5shiONb9XTbi6/T9pDHmx6Bvz6kkj/VhaJvupuHNEQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "imapdedup";
|
||||
version = "1.2";
|
||||
pyproject = true;
|
||||
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "quentinsf";
|
||||
repo = "IMAPdedup";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CmWkLz9hdmedUxcojmUVTkPjqpaMmtEeHnF7aglKR+s=";
|
||||
};
|
||||
|
||||
@@ -28,4 +28,4 @@ python3Packages.buildPythonApplication rec {
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
mainProgram = "imapdedup";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes";
|
||||
version = "1.34.3";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1X2kxUi7jNnyTNo+ZGZmhU5DHVl98eYOrJ4qpjzqqjE=";
|
||||
hash = "sha256-AT1/4RhnVK/mAoNVqPIfSwbzD8VNRqKumOpE0fidJ74=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lean4";
|
||||
version = "4.25.0";
|
||||
version = "4.26.0";
|
||||
|
||||
# Using a vendored version rather than nixpkgs' version to match the exact version required by
|
||||
# Lean. Apparently, even a slight version change can impact greatly the final performance.
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "leanprover";
|
||||
repo = "lean4";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VM7Y3KzsAWAvDTFXbi183s6tVqlyrMlV3oEsc9d8Rk0=";
|
||||
hash = "sha256-KDHE2RX1H+QKojrOUbJjIiKlv2kCvAwp4H8V81tDHbQ=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -413,6 +413,7 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
fpletz
|
||||
lovesegfault
|
||||
phip1611
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.36-1";
|
||||
hash_aarch64-darwin = "sha256-hLxuQIRUqXHtI+d2Vg/2pbaazjrDVTa0q16hnc9fshk=";
|
||||
version_x86_64-linux = "0.3.36-1";
|
||||
hash_x86_64-linux = "sha256-Yw1BAQ9oKvKxhQI4WwShRn+uIpcHJUhCzH6pY141EaU=";
|
||||
version_aarch64-darwin = "0.3.37-1";
|
||||
hash_aarch64-darwin = "sha256-RvktWUS12XF5dEn1Uq94vKcZSe89D+xXy6/0tfRVYVU=";
|
||||
version_x86_64-linux = "0.3.37-1";
|
||||
hash_x86_64-linux = "sha256-wNyTEHnxjlXtmLs9yc8p7KRAJX4i5aKSkgjGJuimSJQ=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "naja";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "najaeda";
|
||||
repo = "naja";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-94sv8eeQacsCELTMIUhG9JKtJtVAxmF88Pvj9udN/fM=";
|
||||
hash = "sha256-emtn/RsLQljcQ/rLV7lzhBEX+8ilBBvBS3J+nG9DNGo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,16 +14,16 @@ assert
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opa-envoy-plugin";
|
||||
version = "1.12.1-envoy";
|
||||
version = "1.12.2-envoy";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa-envoy-plugin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8JfzdmgXkdwbcjMxo1KnEe2YfYnEff0O27KiWeww6n4=";
|
||||
hash = "sha256-9S4W/YCrlLonzTn2T8mha0j41P+yJf0l1UOgcdG+L30=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zv9tx3bT4hEzegQoqd/u1oD+tvgQlypeqv3KXJFDWLE=";
|
||||
vendorHash = "sha256-8gDHfC9UfN4Vz6f34gaQyxCLlQWg/F3QglSvM/bTUec=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
clipper,
|
||||
cmake,
|
||||
cups,
|
||||
@@ -11,43 +10,25 @@
|
||||
ninja,
|
||||
proj,
|
||||
qt5,
|
||||
xcbuild,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JfjQe7t3F/9/ik7b+6UUbsYIcpkSDxHBgnbQEYyDTMI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/OpenOrienteering/mapper/pull/1907
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
|
||||
hash = "sha256-pQzw2EfVay+0GOtIbh1KJOkILcj5LRMzmMYy9q+abK4=";
|
||||
})
|
||||
# https://github.com/OpenOrienteering/mapper/pull/2337
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenOrienteering/mapper/commit/d1f214ee2abf140ae3615a2995f08c19ad81418a.patch";
|
||||
hash = "sha256-eJZpHdFPW7A69aazI+WRSK9N87d4A6x973hMYTHdw5I=";
|
||||
})
|
||||
# https://github.com/OpenOrienteering/mapper/pull/2227
|
||||
(fetchpatch {
|
||||
url = "https://github.com/OpenOrienteering/mapper/commit/fa694d74f2840d7f18976d7f35debcb99bd173eb.patch";
|
||||
hash = "sha256-GVlNeIFiCG7anPsJR2nDCbgXEeUEAUvTcSaJ53Q/eV4=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "find_package(ClangTidy" "#find_package(ClangTidy"
|
||||
substituteInPlace packaging/custom_install.cmake.in \
|
||||
--replace "fixup_bundle_portable(" "#fixup_bundle_portable("
|
||||
--replace-fail "fixup_bundle_portable(" "#fixup_bundle_portable("
|
||||
substituteInPlace src/CMakeLists.txt --replace-fail plutil echo
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -56,6 +37,9 @@ stdenv.mkDerivation rec {
|
||||
ninja
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild # for plutil
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -88,13 +72,16 @@ stdenv.mkDerivation rec {
|
||||
(lib.cmakeBool "Mapper_PACKAGE_GDAL" false)
|
||||
];
|
||||
|
||||
postInstall =
|
||||
with stdenv;
|
||||
lib.optionalString isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/Mapper.app $out/Applications
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
|
||||
'';
|
||||
postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
chmod +w src/Mapper.app/Contents/Info.plist
|
||||
plutil -replace NSHighResolutionCapable -bool true src/Mapper.app/Contents/Info.plist
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/Mapper.app $out/Applications
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.openorienteering.org/apps/mapper/";
|
||||
|
||||
@@ -2,12 +2,20 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libusb1,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
let
|
||||
# udev rules are in another unversioned repo
|
||||
udevRules = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/probe-rs/webpage/054a0b16831593091a8a5624d0e2305573e860ee/public/files/69-probe-rs.rules";
|
||||
hash = "sha256-yjxld5ebm2jpfyzkw+vngBfHu5Nfh2ioLUKQQDY4KYo=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-tools";
|
||||
version = "0.30.0";
|
||||
@@ -35,6 +43,10 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m 444 ${udevRules} $out/etc/udev/rules.d/69-probe-rs.rules
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# require a physical probe
|
||||
"--skip=cmd::dap_server::server::debugger::test::attach_request"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ps_mem";
|
||||
version = "3.14";
|
||||
pyproject = true;
|
||||
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixelb";
|
||||
repo = "ps_mem";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jCfPtPSky/QFk9Xo/tq3W7609Pie1yLC4iS4dqjCa+E=";
|
||||
};
|
||||
|
||||
@@ -28,4 +28,4 @@ python3Packages.buildPythonApplication rec {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "ps_mem";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
p7zip,
|
||||
}:
|
||||
let
|
||||
version = "1.024";
|
||||
version = "1.027";
|
||||
|
||||
source =
|
||||
with lib.attrsets;
|
||||
@@ -18,10 +18,10 @@ let
|
||||
})
|
||||
)
|
||||
{
|
||||
Mono = "sha256-JSGr3/q5Ca0AphQlfWYKOnKYt2Nr0CtNmv/j27WxBz8=";
|
||||
Round = "sha256-DDMGf+QK8MIRfGFb7QY4sycyGUGmoZAq1OhMQ2VgBbY=";
|
||||
Sans = "sha256-V+fabg4yC1TBVePs4+mpv6LBqq5bH6dTSHtX+SWFR3E=";
|
||||
Serif = "sha256-z55QTCtpVljW+JMdGJJLAm6TIq70maRiegehxoTvhWI=";
|
||||
Mono = "sha256-Q1vFGfnVbZgpuk/dHNGIhQ8eZTMOChGjG2x7H/a/z9c=";
|
||||
Round = "sha256-DtrXQsBPZM+LFZUBwlRni0oCTU30h+dF5pL1Bkb/y6A=";
|
||||
Sans = "sha256-3vDFtygo3lNznhI/WDEvvYi1mz19zGi0yq6DzrTSgFs=";
|
||||
Serif = "sha256-4xVMHgUXBjroehu01G3IP7gSlkjkx9SR7PwDwoVKWoo=";
|
||||
};
|
||||
|
||||
extraOutputs = builtins.attrNames source;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
}:
|
||||
let
|
||||
version = "12.9.3";
|
||||
version = "14.0.1";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "source-meta-json-schema";
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "sourcemeta";
|
||||
repo = "jsonschema";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QfjCoYl+v/1El0IW11ZkKCLRN52GDFjpCGyclUyB9GM=";
|
||||
hash = "sha256-ybBSH7TdjbTrOn1jvYijcrDkk04QMm8nWDoBVn/lCsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store-frontend";
|
||||
version = "2.15.86";
|
||||
version = "2.15.87";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store-Front-End";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-87ELt2HAzaNsM9pPnxei84nrew5oYag6cJq7BkqDX+w=";
|
||||
hash = "sha256-7YUCxzFrA2x8Rref+SfOHmhLx8+HDfVIK3xe4BGKs9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sub-store";
|
||||
version = "2.20.65";
|
||||
version = "2.20.75";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sub-store-org";
|
||||
repo = "Sub-Store";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HGaxpQJ9evcxz7nSJ5VBtjeS2xBLeJrkIcnUMNDr/L0=";
|
||||
hash = "sha256-6P9ofDNOk+jTqpv3OsfiMCMLpvaKTDAdupfKusARHdg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
||||
@@ -19,7 +19,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
|
||||
"Drag and drop support is only available for linux with xorg."
|
||||
|
||||
python3Packages.buildPythonApplication
|
||||
rec {
|
||||
(finalAttrs: {
|
||||
pname = "tuifimanager";
|
||||
version = "5.1.5";
|
||||
|
||||
@@ -28,7 +28,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
|
||||
src = fetchFromGitHub {
|
||||
owner = "GiorgosXou";
|
||||
repo = "TUIFIManager";
|
||||
tag = "v.${version}";
|
||||
tag = "v.${finalAttrs.version}";
|
||||
hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8=";
|
||||
};
|
||||
|
||||
@@ -86,4 +86,4 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
|
||||
];
|
||||
mainProgram = "tuifi";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayscriber";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devmobasa";
|
||||
repo = "wayscriber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lPtgH4HaqBq7qQAgGUqbWiwaTSHXzPGuHe/PuMw0HmA=";
|
||||
hash = "sha256-5CHEMed3QZ8xixMm/wDdR+kt7TnG8jwuy4wWKyTP3bg=";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
pango
|
||||
libxkbcommon
|
||||
];
|
||||
cargoHash = "sha256-rWUkWL1qPGzbAhRnOSX+A2RXWlfTbkFbKj3n8cHXk3c=";
|
||||
cargoHash = "sha256-AXVZ8Lk/Ie58SVrYRITEdrGEEe5gA5RD6y0HlLZUlnk=";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
}:
|
||||
llvmPackages_20.stdenv.mkDerivation {
|
||||
pname = "xenia-canary";
|
||||
version = "0-unstable-2025-12-30";
|
||||
version = "0-unstable-2026-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xenia-canary";
|
||||
repo = "xenia-canary";
|
||||
fetchSubmodules = true;
|
||||
rev = "53c0178766f3370794bd123ee5634702d40f6e44";
|
||||
hash = "sha256-zZY+490yHHRga1O2VI0Mtc7gS95Nj82Igbh4TrMnf5Q=";
|
||||
rev = "4b73839bf1eec853e926bf999f0f9e650c6ec39d";
|
||||
hash = "sha256-Pg3K9G00mXdsku5wDY+UxapPBIXsuivwVCtBjk+GzBo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
|
||||
gtk2
|
||||
libexif
|
||||
];
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
# gcc15 build failure
|
||||
"-std=gnu17"
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace config.mk \
|
||||
--replace /usr/local $out
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zenith";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bvaisvil";
|
||||
repo = "zenith";
|
||||
rev = version;
|
||||
hash = "sha256-y+/s0TDVAFGio5uCzHjf+kHFZB0G8dDgTt2xaqSSz1c=";
|
||||
hash = "sha256-kMjDbWhey3SoT4hlEz2mEoSIICfI+X03PdBgTs5yxuI=";
|
||||
};
|
||||
|
||||
# remove cargo config so it can find the linker on aarch64-linux
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
rm .cargo/config
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-xfp+nR4ihaTO4AZHizYg4qqf9MR030Qb5bN2nzhbytQ=";
|
||||
cargoHash = "sha256-M+I7+mcXn2UM340loy4OS6z+uZMxwiO/JwD0KjHvcFw=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zsh-forgit";
|
||||
version = "25.12.0";
|
||||
version = "26.01.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DN2QUxCVVjYn7b4xt/7+k5g1/7dfZ+cp5Yi0nJWh1mM=";
|
||||
hash = "sha256-3PjKFARsN3BE5c3/JonNj+LpKBPT1N3hc1bK6NdWDTQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-core-amqp_1.0.0-beta.11";
|
||||
hash = "sha256-MQsz5Dmv1BwfUaN1VXMC3hPdMHihlgOBaukp5wgTNJc=";
|
||||
};
|
||||
sourceRoot = "source/sdk/core/azure-core-amqp";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/core/azure-core-amqp";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-core-tracing-opentelemetry_1.0.0-beta.4";
|
||||
hash = "sha256-3PqHpoi7zlTUYJ4A4APKp2yPg9nVwgGiyOZ+bng4Crk=";
|
||||
};
|
||||
sourceRoot = "source/sdk/core/azure-core-tracing-opentelemetry";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/core/azure-core-tracing-opentelemetry";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-core_1.16.1";
|
||||
hash = "sha256-gMINz3bH80l0QYX3iKJlL962WIMujR1wuN+t4t7g7qg=";
|
||||
};
|
||||
sourceRoot = "source/sdk/core/azure-core";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/core/azure-core";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-data-tables_1.0.0-beta.6";
|
||||
hash = "sha256-gfkjoA16UP6ToIueYPfhQFh+LEhlVtvTk3qRJoHR5OY=";
|
||||
};
|
||||
sourceRoot = "source/sdk/tables/azure-data-tables";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/tables/azure-data-tables";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-identity_1.13.2";
|
||||
hash = "sha256-864fU7BkVWXE0vVEYniXQUbrNRvLhhv6aR3wwdnjbQo=";
|
||||
};
|
||||
sourceRoot = "source/sdk/identity/azure-identity";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/identity/azure-identity";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1";
|
||||
hash = "sha256-487IwzlxnKd09ztf9NQESbp/kZzsT18JXKgMwsG5W/Y=";
|
||||
};
|
||||
sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-messaging-eventhubs_1.0.0-beta.10";
|
||||
hash = "sha256-qGYfvRFnesI+oIp3jCRo53v66aR2qrcummSNpc5sCOw=";
|
||||
};
|
||||
sourceRoot = "source/sdk/eventhubs/azure-messaging-eventhubs";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/eventhubs/azure-messaging-eventhubs";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-security-attestation_1.1.0";
|
||||
hash = "sha256-RXCMB7MMIe5x5YgMAqAf306E/1vuRXweAlN5uDHumjA=";
|
||||
};
|
||||
sourceRoot = "source/sdk/attestation/azure-security-attestation";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/attestation/azure-security-attestation";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-security-keyvault-administration_4.0.0-beta.5";
|
||||
hash = "sha256-EaiJ2Q6c1VsL+RRF0MvS8jdcHwrKLeTJ0fBlySFt/+w=";
|
||||
};
|
||||
sourceRoot = "source/sdk/keyvault/azure-security-keyvault-administration";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/keyvault/azure-security-keyvault-administration";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-security-keyvault-certificates_4.3.0-beta.4";
|
||||
hash = "sha256-6LvqeSqSz5oDxXoR/vD7Pbxc2ksQflFhIrN7DzmMoaE=";
|
||||
};
|
||||
sourceRoot = "source/sdk/keyvault/azure-security-keyvault-certificates";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/keyvault/azure-security-keyvault-certificates";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-security-keyvault-keys_4.5.0-beta.3";
|
||||
hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU=";
|
||||
};
|
||||
sourceRoot = "source/sdk/keyvault/azure-security-keyvault-keys";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/keyvault/azure-security-keyvault-keys";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-security-keyvault-secrets_4.3.0-beta.4";
|
||||
hash = "sha256-NSstk0cpgWBOhi50eiFSHDYiJjel2a4l8xxgfIPKSsU=";
|
||||
};
|
||||
sourceRoot = "source/sdk/keyvault/azure-security-keyvault-secrets";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/keyvault/azure-security-keyvault-secrets";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-storage-blobs_12.15.0";
|
||||
hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08=";
|
||||
};
|
||||
sourceRoot = "source/sdk/storage/azure-storage-blobs";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-blobs";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-storage-common_12.11.0";
|
||||
hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08=";
|
||||
};
|
||||
sourceRoot = "source/sdk/storage/azure-storage-common";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-common";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-storage-files-datalake_12.13.0";
|
||||
hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08=";
|
||||
};
|
||||
sourceRoot = "source/sdk/storage/azure-storage-files-datalake";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-files-datalake";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-storage-files-shares_12.15.0";
|
||||
hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08=";
|
||||
};
|
||||
sourceRoot = "source/sdk/storage/azure-storage-files-shares";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-files-shares";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tag = "azure-storage-queues_12.5.0";
|
||||
hash = "sha256-u+zaMoX64GcTKE7QIF5WyENTogLBMTCenoI8hPY7m08=";
|
||||
};
|
||||
sourceRoot = "source/sdk/storage/azure-storage-queues";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/storage/azure-storage-queues";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtutilities";
|
||||
version = "6.18.4";
|
||||
version = "6.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "qtutilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IZDEtytcH+edJNoMaSWKQDMmPpiQH5QNJWLKaRKCWhU=";
|
||||
hash = "sha256-xyHnub8elkQXy3A66/WvlSAOj21b0jBiWPK1P1GQbTc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,15 @@
|
||||
casadi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aerosandbox";
|
||||
version = "4.2.8";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "AeroSandbox";
|
||||
inherit version format;
|
||||
inherit (finalAttrs) version;
|
||||
format = "wheel";
|
||||
|
||||
python = "py3";
|
||||
dist = "py3";
|
||||
@@ -49,4 +50,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
bce-python-sdk,
|
||||
click,
|
||||
prettytable,
|
||||
psutil,
|
||||
requests,
|
||||
tqdm,
|
||||
psutil,
|
||||
click,
|
||||
prettytable,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -30,11 +30,13 @@ buildPythonPackage {
|
||||
|
||||
dependencies = [
|
||||
bce-python-sdk
|
||||
click
|
||||
prettytable
|
||||
psutil
|
||||
requests
|
||||
tqdm
|
||||
# Implicit dependency for file_download.py
|
||||
psutil
|
||||
# `aistudio` binary dependencies
|
||||
click
|
||||
prettytable
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aistudio_sdk" ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
truststore,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "atopile-easyeda2kicad";
|
||||
version = "0.9.7";
|
||||
pyproject = true;
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "atopile";
|
||||
repo = "easyeda2kicad.py";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l5ecNNu9vu073aK85F+tOSodEHk2wso95RYXk9DyTFo=";
|
||||
};
|
||||
|
||||
@@ -43,9 +43,9 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Convert any LCSC components (including EasyEDA) to KiCad library";
|
||||
homepage = "https://github.com/atopile/easyeda2kicad.py";
|
||||
changelog = "https://github.com/atopile/easyeda2kicad.py/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/atopile/easyeda2kicad.py/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "easyeda2kicad";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "azure-ai-vision-imageanalysis";
|
||||
version = "39.0.0";
|
||||
pyproject = true;
|
||||
@@ -16,11 +16,11 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-sdk-for-python";
|
||||
tag = "azure-mgmt-containerservice_${version}";
|
||||
tag = "azure-mgmt-containerservice_${finalAttrs.version}";
|
||||
hash = "sha256-zufXc8LR4STHi/jjV0bcLsifcHIif2m+3Q/KZlsSkRw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/vision/azure-ai-vision-imageanalysis";
|
||||
sourceRoot = "${finalAttrs.src.name}/sdk/vision/azure-ai-vision-imageanalysis";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -40,4 +40,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,34 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonAtLeast,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
future,
|
||||
pycryptodome,
|
||||
six,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.9.46";
|
||||
version = "0.9.57";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "bce-python-sdk";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "bce_python_sdk";
|
||||
inherit version;
|
||||
hash = "sha256-S/AbIubRcszZSqIB+LxvKpjQ2keEFg53z6z8xxwmhr4=";
|
||||
hash = "sha256-797kmORvaBg/W31BnPgFJLzsLAzWHe+ABdNYtP7PQ4E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# From https://github.com/baidubce/bce-sdk-python/pull/15 . Upstream
|
||||
# doesn't seem to be responsive, the patch there doesn't apply cleanly on
|
||||
# this version, so a vendored patch was produced by running:
|
||||
#
|
||||
# git show -- setup.py baidubce
|
||||
#
|
||||
# in the Git checkout of the PR above.
|
||||
./no-future.patch
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
future
|
||||
pycryptodome
|
||||
six
|
||||
];
|
||||
|
||||
@@ -0,0 +1,348 @@
|
||||
commit 4e5538e58bd330c609bc196b55f2936f8e8676ea
|
||||
Author: Doron Behar <doron.behar@gmail.com>
|
||||
Date: Tue Dec 30 14:21:20 2025 +0200
|
||||
|
||||
Remove future per CVE-2025-50817
|
||||
|
||||
Fix #14 .
|
||||
|
||||
diff --git a/baidubce/auth/bce_v1_signer.py b/baidubce/auth/bce_v1_signer.py
|
||||
index 35c4557..62937e8 100644
|
||||
--- a/baidubce/auth/bce_v1_signer.py
|
||||
+++ b/baidubce/auth/bce_v1_signer.py
|
||||
@@ -13,7 +13,6 @@
|
||||
"""
|
||||
This module provides authentication functions for bce services.
|
||||
"""
|
||||
-from __future__ import absolute_import
|
||||
import hashlib
|
||||
import hmac
|
||||
import logging
|
||||
diff --git a/baidubce/bce_base_client.py b/baidubce/bce_base_client.py
|
||||
index 6905d0f..02976da 100644
|
||||
--- a/baidubce/bce_base_client.py
|
||||
+++ b/baidubce/bce_base_client.py
|
||||
@@ -13,9 +13,7 @@
|
||||
"""
|
||||
This module provide base class for BCE service clients.
|
||||
"""
|
||||
-from __future__ import absolute_import
|
||||
import copy
|
||||
-from builtins import str, bytes
|
||||
|
||||
import baidubce
|
||||
from baidubce import bce_client_configuration
|
||||
diff --git a/baidubce/bce_client_configuration.py b/baidubce/bce_client_configuration.py
|
||||
index 8d4d834..c3e01d3 100644
|
||||
--- a/baidubce/bce_client_configuration.py
|
||||
+++ b/baidubce/bce_client_configuration.py
|
||||
@@ -14,9 +14,6 @@
|
||||
This module defines a common configuration class for BCE.
|
||||
"""
|
||||
|
||||
-from future.utils import iteritems
|
||||
-from builtins import str
|
||||
-from builtins import bytes
|
||||
import baidubce.protocol
|
||||
import baidubce.region
|
||||
from baidubce.retry.retry_policy import BackOffRetryPolicy
|
||||
@@ -70,7 +67,7 @@ class BceClientConfiguration(object):
|
||||
:param other:
|
||||
:return:
|
||||
"""
|
||||
- for k, v in iteritems(other.__dict__):
|
||||
+ for k, v in other.__dict__.items():
|
||||
if v is not None:
|
||||
self.__dict__[k] = v
|
||||
|
||||
diff --git a/baidubce/bce_response.py b/baidubce/bce_response.py
|
||||
index d55447b..1db49dd 100644
|
||||
--- a/baidubce/bce_response.py
|
||||
+++ b/baidubce/bce_response.py
|
||||
@@ -13,9 +13,6 @@
|
||||
"""
|
||||
This module provides a general response class for BCE services.
|
||||
"""
|
||||
-from future.utils import iteritems
|
||||
-from builtins import str
|
||||
-from builtins import bytes
|
||||
from baidubce import utils
|
||||
from baidubce import compat
|
||||
from baidubce.http import http_headers
|
||||
@@ -34,7 +31,7 @@ class BceResponse(object):
|
||||
:param headers:
|
||||
:return:
|
||||
"""
|
||||
- for k, v in iteritems(headers):
|
||||
+ for k, v in headers.items():
|
||||
if k.startswith(compat.convert_to_string(http_headers.BCE_PREFIX)):
|
||||
k = 'bce_' + k[len(compat.convert_to_string(http_headers.BCE_PREFIX)):]
|
||||
k = utils.pythonize_name(k.replace('-', '_'))
|
||||
@@ -48,7 +45,7 @@ class BceResponse(object):
|
||||
:param headers:
|
||||
:return:
|
||||
"""
|
||||
- for k, v in iteritems(headers):
|
||||
+ for k, v in headers.items():
|
||||
if k.lower() == compat.convert_to_string(http_headers.ETAG.lower()):
|
||||
v = v.strip('"')
|
||||
setattr(self.metadata, k, v)
|
||||
diff --git a/baidubce/http/bce_http_client.py b/baidubce/http/bce_http_client.py
|
||||
index 7c5e4bf..fb1e881 100644
|
||||
--- a/baidubce/http/bce_http_client.py
|
||||
+++ b/baidubce/http/bce_http_client.py
|
||||
@@ -13,8 +13,6 @@
|
||||
"""
|
||||
This module provide http request function for bce services.
|
||||
"""
|
||||
-from future.utils import iteritems, iterkeys, itervalues
|
||||
-from builtins import str, bytes
|
||||
import logging
|
||||
import http.client
|
||||
import sys
|
||||
@@ -77,7 +75,7 @@ def _send_http_request(conn, http_method, uri, headers, body, send_buf_size):
|
||||
uri = compat.convert_to_string(uri)
|
||||
conn.putrequest(http_method, uri, skip_host=True, skip_accept_encoding=True)
|
||||
|
||||
- for k, v in iteritems(headers):
|
||||
+ for k, v in headers.items():
|
||||
k = utils.convert_to_standard_string(k)
|
||||
v = utils.convert_to_standard_string(v)
|
||||
conn.putheader(k, v)
|
||||
@@ -110,7 +108,7 @@ def check_headers(headers):
|
||||
:param headers:
|
||||
:return:
|
||||
"""
|
||||
- for k, v in iteritems(headers):
|
||||
+ for k, v in headers.items():
|
||||
if isinstance(v, (bytes, str)) and \
|
||||
b'\n' in compat.convert_to_bytes(v):
|
||||
raise BceClientError(r'There should not be any "\n" in header[%s]:%s' % (k, v))
|
||||
diff --git a/baidubce/services/bcc/bcc_client.py b/baidubce/services/bcc/bcc_client.py
|
||||
index fd09356..66ffa9c 100644
|
||||
--- a/baidubce/services/bcc/bcc_client.py
|
||||
+++ b/baidubce/services/bcc/bcc_client.py
|
||||
@@ -15,8 +15,6 @@
|
||||
This module provides a client class for BCC.
|
||||
"""
|
||||
|
||||
-from __future__ import unicode_literals
|
||||
-
|
||||
import copy
|
||||
import json
|
||||
import logging
|
||||
diff --git a/baidubce/services/bos/bos_client.py b/baidubce/services/bos/bos_client.py
|
||||
index f759114..c5bbc0b 100644
|
||||
--- a/baidubce/services/bos/bos_client.py
|
||||
+++ b/baidubce/services/bos/bos_client.py
|
||||
@@ -22,9 +22,6 @@ import json
|
||||
import logging
|
||||
import shutil
|
||||
import struct
|
||||
-from builtins import str
|
||||
-from builtins import bytes
|
||||
-from future.utils import iteritems, iterkeys, itervalues
|
||||
from concurrent.futures import ThreadPoolExecutor, wait, ALL_COMPLETED, FIRST_COMPLETED
|
||||
import threading
|
||||
import functools
|
||||
@@ -174,7 +171,7 @@ class BosClient(BceBaseClient):
|
||||
@staticmethod
|
||||
def _dump_acl_object(acl):
|
||||
result = {}
|
||||
- for k, v in iteritems(acl.__dict__):
|
||||
+ for k, v in acl.__dict__.items():
|
||||
if not k.startswith('_'):
|
||||
result[k] = v
|
||||
return result
|
||||
@@ -2851,7 +2848,7 @@ class BosClient(BceBaseClient):
|
||||
meta_data_set = set()
|
||||
if not isinstance(user_metadata, dict):
|
||||
raise TypeError('user_metadata should be of type dict.')
|
||||
- for k, v in iteritems(user_metadata):
|
||||
+ for k, v in user_metadata.items():
|
||||
meta_data_set.add(k.lower())
|
||||
k = utils.convert_to_standard_string(k)
|
||||
v = utils.convert_to_standard_string(v)
|
||||
@@ -2911,7 +2908,7 @@ class BosClient(BceBaseClient):
|
||||
http_headers.BCE_COPY_SOURCE_IF_UNMODIFIED_SINCE,
|
||||
http_headers.BCE_COPY_SOURCE_IF_MODIFIED_SINCE]))
|
||||
|
||||
- for k, v in iteritems(user_headers):
|
||||
+ for k, v in user_headers.items():
|
||||
k = utils.convert_to_standard_string(k)
|
||||
if k != http_headers.BOS_OBJECT_EXPIRES:
|
||||
v = utils.convert_to_standard_string(v)
|
||||
diff --git a/baidubce/services/cert/cert_client.py b/baidubce/services/cert/cert_client.py
|
||||
index 9b005b4..1cfe55f 100644
|
||||
--- a/baidubce/services/cert/cert_client.py
|
||||
+++ b/baidubce/services/cert/cert_client.py
|
||||
@@ -14,8 +14,6 @@
|
||||
This module provides a client class for CERT.
|
||||
"""
|
||||
|
||||
-from __future__ import unicode_literals
|
||||
-
|
||||
import copy
|
||||
import json
|
||||
import logging
|
||||
diff --git a/baidubce/services/esg/esg_client.py b/baidubce/services/esg/esg_client.py
|
||||
index e0827f4..fcedd7e 100644
|
||||
--- a/baidubce/services/esg/esg_client.py
|
||||
+++ b/baidubce/services/esg/esg_client.py
|
||||
@@ -13,7 +13,6 @@
|
||||
"""
|
||||
This module provides a client class for esg.
|
||||
"""
|
||||
-from __future__ import unicode_literals
|
||||
|
||||
import copy
|
||||
import json
|
||||
diff --git a/baidubce/services/iam/iam_client.py b/baidubce/services/iam/iam_client.py
|
||||
index ee804ca..d2ce54e 100644
|
||||
--- a/baidubce/services/iam/iam_client.py
|
||||
+++ b/baidubce/services/iam/iam_client.py
|
||||
@@ -18,8 +18,6 @@ import copy
|
||||
import json
|
||||
import logging
|
||||
|
||||
-from future.utils import iteritems
|
||||
-
|
||||
from baidubce.auth import bce_v1_signer
|
||||
from baidubce.bce_base_client import BceBaseClient
|
||||
from baidubce.http import bce_http_client
|
||||
diff --git a/baidubce/services/rds/rds_client.py b/baidubce/services/rds/rds_client.py
|
||||
index 71e058b..a055986 100644
|
||||
--- a/baidubce/services/rds/rds_client.py
|
||||
+++ b/baidubce/services/rds/rds_client.py
|
||||
@@ -14,8 +14,6 @@
|
||||
This module provides a client class for RDS.
|
||||
"""
|
||||
|
||||
-from __future__ import unicode_literals
|
||||
-
|
||||
import copy
|
||||
import json
|
||||
import logging
|
||||
diff --git a/baidubce/services/scs/scs_client.py b/baidubce/services/scs/scs_client.py
|
||||
index c4c1631..c20d593 100644
|
||||
--- a/baidubce/services/scs/scs_client.py
|
||||
+++ b/baidubce/services/scs/scs_client.py
|
||||
@@ -16,7 +16,6 @@
|
||||
"""
|
||||
This module provides a client class for SCS.
|
||||
"""
|
||||
-from __future__ import unicode_literals
|
||||
|
||||
import copy
|
||||
import json
|
||||
diff --git a/baidubce/services/sts/sts_client.py b/baidubce/services/sts/sts_client.py
|
||||
index 9aba0e3..22ee710 100644
|
||||
--- a/baidubce/services/sts/sts_client.py
|
||||
+++ b/baidubce/services/sts/sts_client.py
|
||||
@@ -14,7 +14,6 @@
|
||||
This module provides a client for STS.
|
||||
"""
|
||||
|
||||
-from future.utils import iteritems
|
||||
import copy
|
||||
import http.client
|
||||
import os
|
||||
@@ -94,7 +93,7 @@ class StsClient(BceBaseClient):
|
||||
@staticmethod
|
||||
def _dump_acl_object(acl):
|
||||
result = {}
|
||||
- for k, v in iteritems(acl.__dict__):
|
||||
+ for k, v in acl.__dict__.items():
|
||||
if not k.startswith('_'):
|
||||
result[k] = v
|
||||
return result
|
||||
diff --git a/baidubce/utils.py b/baidubce/utils.py
|
||||
index 1318bbf..3295abf 100644
|
||||
--- a/baidubce/utils.py
|
||||
+++ b/baidubce/utils.py
|
||||
@@ -13,11 +13,6 @@
|
||||
"""
|
||||
This module provide some tools for bce client.
|
||||
"""
|
||||
-# str() generator unicode,bytes() for ASCII
|
||||
-from __future__ import print_function
|
||||
-from __future__ import absolute_import
|
||||
-from builtins import str, bytes
|
||||
-from future.utils import iteritems, iterkeys, itervalues
|
||||
from baidubce import compat
|
||||
|
||||
import os
|
||||
@@ -175,7 +170,7 @@ def safe_get_element(name, container):
|
||||
:return:
|
||||
**Value**
|
||||
"""
|
||||
- for k, v in iteritems(container):
|
||||
+ for k, v in container.items():
|
||||
if k.strip().lower() == name.strip().lower():
|
||||
return v
|
||||
return ""
|
||||
@@ -320,7 +315,7 @@ def guess_content_type_by_file_name(file_name):
|
||||
file_name = compat.convert_to_string(file_name)
|
||||
name = os.path.basename(file_name.lower())
|
||||
suffix = name.split('.')[-1]
|
||||
- if suffix in iterkeys(mime_map):
|
||||
+ if suffix in mime_map.keys():
|
||||
mime_type = mime_map[suffix]
|
||||
else:
|
||||
import mimetypes
|
||||
@@ -368,7 +363,7 @@ def get_canonical_querystring(params, for_signature):
|
||||
if params is None:
|
||||
return ''
|
||||
result = []
|
||||
- for k, v in iteritems(params):
|
||||
+ for k, v in params.items():
|
||||
if not for_signature or k.lower != http_headers.AUTHORIZATION.lower():
|
||||
if v is None:
|
||||
v = ''
|
||||
@@ -384,7 +379,7 @@ def print_object(obj):
|
||||
:return:
|
||||
"""
|
||||
tmp = []
|
||||
- for k, v in iteritems(obj.__dict__):
|
||||
+ for k, v in obj.__dict__.items():
|
||||
if not k.startswith('__') and k != "raw_data":
|
||||
if isinstance(v, bytes):
|
||||
tmp.append("%s:'%s'" % (k, v))
|
||||
@@ -419,7 +414,7 @@ def dict_to_python_object(d):
|
||||
:return:
|
||||
"""
|
||||
attr = {}
|
||||
- for k, v in iteritems(d):
|
||||
+ for k, v in d.items():
|
||||
if not isinstance(k, compat.string_types):
|
||||
k = compat.convert_to_string(k)
|
||||
k = pythonize_name(k)
|
||||
@@ -445,7 +440,7 @@ def required(**types):
|
||||
(f.__code__.co_varnames[i],
|
||||
v,
|
||||
types[f.__code__.co_varnames[i]]))
|
||||
- for k, v in iteritems(kwds):
|
||||
+ for k, v in kwds.items():
|
||||
if k in types:
|
||||
if v is None:
|
||||
raise ValueError('arg "%s" should not be None' % k)
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 54ca7b6..281de62 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -13,7 +13,6 @@
|
||||
"""
|
||||
The setup script to install BCE SDK for python
|
||||
"""
|
||||
-from __future__ import absolute_import
|
||||
import io
|
||||
import os
|
||||
import re
|
||||
@@ -30,7 +29,6 @@ setup(
|
||||
name='bce-python-sdk',
|
||||
version=SDK_VERSION,
|
||||
install_requires=['pycryptodome>=3.8.0',
|
||||
- 'future>=0.6.0',
|
||||
'six>=1.4.0'],
|
||||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <4',
|
||||
packages=['baidubce',
|
||||
@@ -6,7 +6,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "case-converter";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisdoherty4";
|
||||
repo = "python-case-converter";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PS/9Ndl3oD9zimEf819dNoSAeNJPndVjT+dkfW7FIJs=";
|
||||
};
|
||||
|
||||
@@ -29,8 +29,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Case conversion library for Python";
|
||||
homepage = "https://github.com/chrisdoherty4/python-case-converter";
|
||||
changelog = "https://github.com/chrisdoherty4/python-case-converter/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/chrisdoherty4/python-case-converter/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cgen";
|
||||
version = "2025.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-efAeAQ1JwT5YtMqPLUmWprcXiWj18tkGJiczSArnotQ=";
|
||||
};
|
||||
|
||||
@@ -35,4 +35,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
mypy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "crossandra";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
@@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "trag1c";
|
||||
repo = "crossandra";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/JhrjXRH7Rs2bUil9HRneBC9wlVYEyfwivjzb+eyRv8=";
|
||||
};
|
||||
|
||||
@@ -33,10 +33,10 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/trag1c/crossandra/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/trag1c/crossandra/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Fast and simple enum/regex-based tokenizer with decent configurability";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://trag1c.github.io/crossandra";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dahlia";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dahlia-lib";
|
||||
repo = "dahlia";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-489wI0SoC6EU9lC2ISYsLOJUC8g+kLA7UpOrDiBCBmo=";
|
||||
};
|
||||
|
||||
@@ -24,11 +24,11 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/dahlia-lib/dahlia/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Simple text formatting package, inspired by the game Minecraft";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/dahlia-lib/dahlia";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "dahlia";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "esper";
|
||||
version = "3.3";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "benmoran56";
|
||||
repo = "esper";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DZAF2B40ulSn2MQadklT32Svcm1j0e/hIxrxISO07TI=";
|
||||
};
|
||||
|
||||
@@ -26,8 +26,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "ECS (Entity Component System) for Python";
|
||||
homepage = "https://github.com/benmoran56/esper";
|
||||
changelog = "https://github.com/benmoran56/esper/blob/${src.rev}/RELEASE_NOTES";
|
||||
changelog = "https://github.com/benmoran56/esper/blob/${finalAttrs.src.tag}/RELEASE_NOTES";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
version = "0.2";
|
||||
pname = "ewmhlib";
|
||||
pyproject = true;
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kalmat";
|
||||
repo = "EWMHlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
tag = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-NELOgUV8KuN+CqmoSbLYImguHlp8dyhGmJtoxJjOBkA=";
|
||||
};
|
||||
|
||||
@@ -37,4 +37,4 @@ buildPythonPackage rec {
|
||||
description = "Extended Window Manager Hints implementation in Python 3";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
pytestCheckHook,
|
||||
lib,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastapi-github-oidc";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "atopile";
|
||||
repo = "fastapi-github-oidc";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-FS50++Hy9h0RFrSnc4PbXFPh/1OO0JOaFdIZwoXa86A=";
|
||||
};
|
||||
|
||||
@@ -48,8 +48,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "FastAPI compatible middleware to authenticate Github OIDC Tokens";
|
||||
homepage = "https://github.com/atopile/fastapi-github-oidc";
|
||||
changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
pyarrow,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "feather-format";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
|
||||
hash = "sha256-RfZ+N0XTlNTxYMptY2u/1Pi2jQEZncFkm25IfT6HiQM=";
|
||||
};
|
||||
@@ -29,4 +29,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "glob2";
|
||||
version = "0.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5";
|
||||
};
|
||||
|
||||
@@ -25,4 +25,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
distutils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gputil";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anderskm";
|
||||
repo = "gputil";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iOyB653BMmDBtK1fM1ZyddjlnaypsuLMOV0sKaBt+yE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ distutils ];
|
||||
|
||||
pythonImportsCheck = [ "GPUtil" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/anderskm/gputil";
|
||||
license = lib.licenses.mit;
|
||||
description = "Getting GPU status from NVIDA GPUs using nvidia-smi";
|
||||
changelog = "https://github.com/anderskm/gputil/releases/tag/${src.tag}";
|
||||
maintainers = with lib.maintainers; [
|
||||
doronbehar
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -26,7 +26,7 @@
|
||||
pytest-cov-stub,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gstools";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeoStat-Framework";
|
||||
repo = "GSTools";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rQ7mSa1BWAaRiiE6aQD6jl8BktihY9bjFJV+5eT9n/M=";
|
||||
};
|
||||
|
||||
@@ -65,13 +65,13 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
meta = {
|
||||
description = "Geostatistical toolbox";
|
||||
homepage = "https://github.com/GeoStat-Framework/GSTools";
|
||||
changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
pytest-xdist,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hankel";
|
||||
version = "1.2.2";
|
||||
pyproject = true;
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "steven-murray";
|
||||
repo = "hankel";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE=";
|
||||
};
|
||||
|
||||
@@ -55,8 +55,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Implementation of Ogata's (2005) method for Hankel transforms";
|
||||
homepage = "https://github.com/steven-murray/hankel";
|
||||
changelog = "https://github.com/steven-murray/hankel/v${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/steven-murray/hankel/v${finalAttrs.version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
pynacl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hikari-crescent";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hikari-crescent";
|
||||
repo = "hikari-crescent";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-86NCAlN5/JGrxPVIMs6ARr6H4G3shPcgxASwukptyJo=";
|
||||
};
|
||||
|
||||
@@ -50,4 +50,4 @@ buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "hikari-crescent";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
pytest-asyncio,
|
||||
mock,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hikari";
|
||||
version = "2.4.1";
|
||||
pyproject = true;
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hikari-py";
|
||||
repo = "hikari";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lkJICN5uXFIKUZwxZI82FSYZLWFa7Cb6tDs6wV9DsY0=";
|
||||
# The git commit is part of the `hikari.__git_sha1__` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
@@ -77,11 +77,11 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Discord API wrapper for Python written with asyncio";
|
||||
homepage = "https://www.hikari-py.dev/";
|
||||
changelog = "https://github.com/hikari-py/hikari/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/hikari-py/hikari/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
tomodachi94
|
||||
sigmanificient
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
sphinx-design,
|
||||
stdenv,
|
||||
tabulate,
|
||||
tomli,
|
||||
tornado,
|
||||
types-pyyaml,
|
||||
types-requests,
|
||||
@@ -232,6 +233,7 @@ stdenv.mkDerivation rec {
|
||||
sphinx-argparse
|
||||
sphinx-design
|
||||
tabulate
|
||||
tomli
|
||||
tornado
|
||||
types-pyyaml
|
||||
types-requests
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "intbitset";
|
||||
version = "4.1.0";
|
||||
pyproject = true;
|
||||
@@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-cxRf8F5CJ8dlhf+FUGOLagg80TABC3gQRdga9Y97aSA=";
|
||||
};
|
||||
|
||||
@@ -27,8 +27,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "C-based extension implementing fast integer bit sets";
|
||||
homepage = "https://github.com/inveniosoftware/intbitset";
|
||||
changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${finalAttrs.version}/CHANGELOG.rst";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ixia";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "trag1c";
|
||||
repo = "ixia";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8STtLL63V+XnDqDNZOx7X9mkjUu176SSyQOL55LXFz0=";
|
||||
};
|
||||
|
||||
@@ -24,10 +24,10 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "ixia" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/trag1c/ixia/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/trag1c/ixia/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Connecting secrets' security with random's versatility";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://trag1c.github.io/ixia";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
materialyoucolor,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kde-material-you-colors";
|
||||
version = "1.10.1";
|
||||
pyproject = true;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "luisbocanegra";
|
||||
repo = "kde-material-you-colors";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qiaFHu4eyX73cAbMdoP46SiiFjNWx2vXWVzEbCsTNBI=";
|
||||
};
|
||||
|
||||
@@ -41,4 +41,4 @@ buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "kde-material-you-colors";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
pythonOlder,
|
||||
typing-extensions,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kicad-python";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitLab {
|
||||
owner = "kicad/code";
|
||||
repo = "kicad-python";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-M2vJ/lSwc1XjrG661ayNIOZKJitmy/UPM2SesQI1xYE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@@ -67,4 +67,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
kicad,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kicadcliwrapper";
|
||||
version = "1.1.1";
|
||||
pyproject = true;
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "atopile";
|
||||
repo = "kicadcliwrapper";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s1j0k6SvZiIHu8PKGTR+GaYUZIlFq5TKYuxoCsvsvUY=";
|
||||
};
|
||||
|
||||
@@ -52,4 +52,4 @@ buildPythonPackage rec {
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
werkzeug,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "libsass";
|
||||
version = "0.23.0";
|
||||
format = "setuptools";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "libsass-python";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CiSr9/3EDwpDEzu6VcMBAlm3CtKTmGYbZMnMEjyZVxI=";
|
||||
};
|
||||
|
||||
@@ -44,4 +44,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "loguru-logging-intercept";
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
# no tags on git
|
||||
src = fetchPypi {
|
||||
pname = "loguru_logging_intercept";
|
||||
inherit version;
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-WBA4vxMQ+7Bs2kivvTc+crvAHVHE3wWPSQgat6fF+YQ=";
|
||||
};
|
||||
|
||||
@@ -30,4 +30,4 @@ buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mdformat-gfm-alerts";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KyleKing";
|
||||
repo = "mdformat-gfm-alerts";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hfi4Ek91G8WHAWjv7m52ZnT5Je9QyZT4yWSecaeTcvA=";
|
||||
};
|
||||
|
||||
@@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Format 'GitHub Markdown Alerts', which use blockquotes to render admonitions";
|
||||
homepage = "https://github.com/KyleKing/mdformat-gfm-alerts";
|
||||
changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.31.0";
|
||||
version = "1.33.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "modelscope";
|
||||
@@ -20,15 +20,9 @@ buildPythonPackage {
|
||||
owner = "modelscope";
|
||||
repo = "modelscope";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3o3iI4LGDSsF36jnrUTN3bBaM8XGCw+msIPS3WauMNQ=";
|
||||
hash = "sha256-CEaeO6oD1enGKT87anc3qSynDaN8pTC4utNoMBTvL84=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "exec(compile(f.read(), version_file, 'exec'))" "ns = {}; exec(compile(f.read(), version_file, 'exec'), ns)" \
|
||||
--replace-fail "return locals()['__version__']" "return ns['__version__']"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -47,6 +41,9 @@ buildPythonPackage {
|
||||
homepage = "https://github.com/modelscope/modelscope";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "modelscope";
|
||||
maintainers = with lib.maintainers; [ kyehn ];
|
||||
maintainers = with lib.maintainers; [
|
||||
kyehn
|
||||
doronbehar
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
xlrd,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nemosis";
|
||||
version = "3.8.1";
|
||||
pyproject = true;
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "UNSW-CEEM";
|
||||
repo = "NEMOSIS";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4Bb9yZUfwkFQVNSVGtg3APXPovos23oHAx4v+6aa7MM=";
|
||||
};
|
||||
|
||||
@@ -46,4 +46,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "normality";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "pudo";
|
||||
repo = "normality";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-X8ssSURC3NiQ1uf2qv1PgCBIYQnmoYVKPn5YPdJG71o=";
|
||||
};
|
||||
|
||||
@@ -41,4 +41,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
ixia,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "oddsprout";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "trag1c";
|
||||
repo = "oddsprout";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RfAU3/Je3aC8JjQ51DqRCSAIfW2tQmQPP6G0/bfa1ZE=";
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "oddsprout" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/trag1c/oddsprout/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/trag1c/oddsprout/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Generate random JSON with no schemas involved";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://trag1c.github.io/oddsprout";
|
||||
@@ -45,4 +45,4 @@ buildPythonPackage rec {
|
||||
];
|
||||
mainProgram = "oddsprout";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
mkPythonMetaPackage,
|
||||
opencv4,
|
||||
}:
|
||||
|
||||
mkPythonMetaPackage {
|
||||
pname = "opencv-contrib-python";
|
||||
inherit (opencv4) version;
|
||||
dependencies = [ opencv4 ];
|
||||
optional-dependencies = opencv4.optional-dependencies or { };
|
||||
meta = {
|
||||
inherit (opencv4.meta) description homepage;
|
||||
};
|
||||
}
|
||||
@@ -39,7 +39,7 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "osxphotos";
|
||||
version = "0.74.2";
|
||||
pyproject = true;
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "RhetTbull";
|
||||
repo = "osxphotos";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dvY6ShScIpJ+HcTJFPOBSETibzfiV8meILI4WrQLsaU=";
|
||||
};
|
||||
|
||||
@@ -111,10 +111,10 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images";
|
||||
homepage = "https://github.com/RhetTbull/osxphotos";
|
||||
changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/RhetTbull/osxphotos/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
# missing utitools dependency
|
||||
broken = true && stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finaAttrs: {
|
||||
pname = "outspin";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "trag1c";
|
||||
repo = "outspin";
|
||||
tag = "v${version}";
|
||||
tag = "v${finaAttrs.version}";
|
||||
hash = "sha256-j+J3n/p+DcfnhGfC4/NDBDl5bF39L5kIPeGJW0Zm7ls=";
|
||||
};
|
||||
|
||||
@@ -24,9 +24,9 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/trag1c/outspin/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/trag1c/outspin/blob/${finaAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Conveniently read single char inputs in the console";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -56,7 +56,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "==72.1.0" ""
|
||||
--replace-fail "setuptools==72.1.0" "setuptools"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
@@ -64,14 +64,6 @@ buildPythonPackage rec {
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
# trying to relax only pymupdf makes the whole build fail
|
||||
pythonRelaxDeps = true;
|
||||
pythonRemoveDeps = [
|
||||
"imgaug"
|
||||
"visualdl"
|
||||
"opencv-contrib-python"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
attrdict
|
||||
beautifulsoup4
|
||||
|
||||
@@ -17,57 +17,28 @@
|
||||
ruamel-yaml,
|
||||
typing-extensions,
|
||||
ujson,
|
||||
distutils,
|
||||
gputil,
|
||||
huggingface-hub,
|
||||
modelscope,
|
||||
aistudio-sdk,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
gputil = buildPythonPackage rec {
|
||||
pname = "gputil";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anderskm";
|
||||
repo = "gputil";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iOyB653BMmDBtK1fM1ZyddjlnaypsuLMOV0sKaBt+yE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ distutils ];
|
||||
|
||||
pythonImportsCheck = [ "GPUtil" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/anderskm/gputil";
|
||||
license = lib.licenses.mit;
|
||||
description = "Getting GPU status from NVIDA GPUs using nvidia-smi";
|
||||
changelog = "https://github.com/anderskm/gputil/releases/tag/${src.tag}";
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "paddlex";
|
||||
version = "3.3.10";
|
||||
version = "3.3.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaddlePaddle";
|
||||
repo = "PaddleX";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zP9MogxeKbnWtbMM6Kz6ItmSdqTZN5U6d1GkskFJhsI=";
|
||||
hash = "sha256-IK+Mk2IWrDGCLH3nw5/WR0uPIFBAsb/h4/MMmSlxT9s=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
"pandas"
|
||||
"pyyaml"
|
||||
];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
hatch-vcs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pandoc-latex-environment";
|
||||
version = "1.2.1.0";
|
||||
pyproject = true;
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "chdemko";
|
||||
repo = "pandoc-latex-environment";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uyOqw8YnTljgXkwZOXTXAsnobVSV65EVicohREBNMCY=";
|
||||
};
|
||||
|
||||
@@ -40,4 +40,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "paperbush";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
@@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "trag1c";
|
||||
repo = "paperbush";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wJV+2aGK9eSw2iToiHh0I7vYAuND2pRYGhnf7CB1a+0=";
|
||||
};
|
||||
|
||||
@@ -21,9 +21,9 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "paperbush" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/trag1c/paperbush/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/trag1c/paperbush/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Super concise argument parsing tool for Python";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "patchpy";
|
||||
version = "2.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-q+k9vYz5crCsBjI5QH7Xz3QVpntzrIXeO456dyrzf4I=";
|
||||
};
|
||||
|
||||
@@ -31,4 +31,4 @@ buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
mainProgram = "patchpy";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pbar";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
@@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "darvil82";
|
||||
repo = "PBar";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc=";
|
||||
};
|
||||
|
||||
@@ -26,4 +26,4 @@ buildPythonPackage rec {
|
||||
homepage = "https://darvil82.github.io/PBar";
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfminer-six";
|
||||
version = "20251227";
|
||||
version = "20251230";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfminer";
|
||||
repo = "pdfminer.six";
|
||||
tag = version;
|
||||
hash = "sha256-O/9B04lLFNoqvvyGAFADuqzIGnthN50V1+PMAFt1ysc=";
|
||||
hash = "sha256-//rcpcEn4lYYEkji2bo801AWj1ThEZPRuq1hNYYyVVk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
pytest-cases,
|
||||
pytest-parallel,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
requests,
|
||||
s3fs,
|
||||
@@ -33,8 +32,6 @@ buildPythonPackage rec {
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rstudio";
|
||||
repo = "pins-python";
|
||||
@@ -47,6 +44,10 @@ buildPythonPackage rec {
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"fsspec"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
appdirs
|
||||
databackend
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
build,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
pep517,
|
||||
pip,
|
||||
pyproject-hooks,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
@@ -19,29 +19,27 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "7.5.1-unstable-2025-11-08";
|
||||
version = "7.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "pip-tools";
|
||||
rev = "785ed5e30f4c86c24141898553a356402b142adf";
|
||||
hash = "sha256-2mYUjLqrpN/sjR79t/ZIfpvVXAgpk/tpZWFcT/6e7uk=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+y4oXiLWGFIzIT75EZFpcYCX5HKeEyPsk+phTOyoKl8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-setup-py-bad-syntax-detection.patch
|
||||
];
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = "7.5.1";
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
build
|
||||
click
|
||||
pep517
|
||||
pip
|
||||
pyproject-hooks
|
||||
setuptools
|
||||
wheel
|
||||
]
|
||||
@@ -60,12 +58,22 @@ buildPythonPackage rec {
|
||||
export no_proxy='*';
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Most tests require network access
|
||||
"tests/test_cli_compile.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"network"
|
||||
"test_direct_reference_with_extras"
|
||||
"test_local_duplicate_subdependency_combined"
|
||||
"test_bad_setup_file"
|
||||
"test_get_hashes_local_repository_cache_miss"
|
||||
"test_toggle_reuse_hashes_local_repository"
|
||||
"test_get_hashes_from_mixed"
|
||||
"test_toggle_reuse_hashes_local_repository"
|
||||
"test_generate_hashes_all_platforms"
|
||||
# Assertion error
|
||||
"test_compile_recursive_extras"
|
||||
"test_compile_build_targets_setuptools_no_wheel_dep"
|
||||
@@ -75,11 +83,6 @@ buildPythonPackage rec {
|
||||
# Deprecations
|
||||
"test_error_in_pyproject_toml"
|
||||
|
||||
# pip 25.0 compat issues
|
||||
# https://github.com/jazzband/pip-tools/issues/2112
|
||||
# requirement doesn't end with semicolon
|
||||
"test_resolver"
|
||||
"test_resolver__custom_unsafe_deps"
|
||||
# constraints.txt is now in a tmpdir
|
||||
"test_preserve_via_requirements_constrained_dependencies_when_run_twice"
|
||||
"test_annotate_option"
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "primer3";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libnano";
|
||||
repo = "primer3-py";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GrVYYjS/+LZScZETfk7YcSy2yrWc3SPumXvyQeEpFUg=";
|
||||
hash = "sha256-HL/kFpz5xvFDKgef2+AI/qjs2jakl00qfPSABYMGyrI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "protoletariat";
|
||||
version = "3.3.10";
|
||||
pyproject = true;
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = "protoletariat";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oaZmgen/7WkX+nNuphrcyniL7Z/OaeqlcnbCnqR5h0w=";
|
||||
};
|
||||
|
||||
@@ -52,8 +52,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Python protocol buffers for the rest of us";
|
||||
changelog = "https://github.com/cpcloud/protoletariat/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/cpcloud/protoletariat/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user