dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

python312Packages.amaranth: 0.5.2 -> 0.5.3 (#349564)

Browse Source
This commit is contained in:
OTABI Tomoya 2024-10-19 11:02:32 +09:00 committed by GitHub
commit e559dd745c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/python-modules/amaranth-boards/default.nix
View File

@ -3,38 +3,36 @@
buildPythonPackage,
fetchFromGitHub,
amaranth,
setuptools,
setuptools-scm,
pdm-backend,
unstableGitUpdater,
}:
buildPythonPackage rec {
pname = "amaranth-boards";
version = "0-unstable-2024-05-01";
version = "0-unstable-2024-10-18";
pyproject = true;
# python setup.py --version
realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}";
# from `pdm show`
realVersion =
let
tag = builtins.elemAt (lib.splitString "-" version) 0;
rev = lib.substring 0 7 src.rev;
in
"${tag}1.dev1+g${rev}";
src = fetchFromGitHub {
owner = "amaranth-lang";
repo = "amaranth-boards";
rev = "aba2300dc83216523e1c98fdb22471cb4bac5027";
rev = "23c66d68045831de0a372c8c237274d74c71ef4e";
# these files change depending on git branch status
postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes";
hash = "sha256-jldXyMJtuSGcZKmtwpZBYrR/UBe4ufblPYRYpBmReM8=";
hash = "sha256-cC7uvj9+6h3RPbFdu3/T1t/jhw5CuLOF8aKwDSkRE54=";
};
nativeBuildInputs = [
setuptools
setuptools-scm
];
dependencies = [
setuptools
amaranth
];
build-system = [ pdm-backend ];
dependencies = [ amaranth ];
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
export PDM_BUILD_SCM_VERSION="${realVersion}"
'';
# no tests

18
pkgs/development/python-modules/amaranth-soc/default.nix
View File

@ -9,22 +9,24 @@
buildPythonPackage rec {
pname = "amaranth-soc";
version = "0.1a-unstable-2024-06-10";
version = "0.1a-unstable-2024-10-12";
pyproject = true;
# from `pdm show`
realVersion = let
tag = builtins.elemAt (lib.splitString "-" version) 0;
rev = lib.substring 0 7 src.rev;
in "${tag}1.dev1+g${rev}";
realVersion =
let
tag = builtins.elemAt (lib.splitString "-" version) 0;
rev = lib.substring 0 7 src.rev;
in
"${tag}1.dev1+g${rev}";
src = fetchFromGitHub {
owner = "amaranth-lang";
repo = "amaranth-soc";
rev = "e1b842800533f44924f21c3867bc2290084d100f";
hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y=";
rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc";
hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8=";
};
nativeBuildInputs = [ pdm-backend ];
build-system = [ pdm-backend ];
dependencies = [ amaranth ];
preBuild = ''

10
pkgs/development/python-modules/amaranth/default.nix
View File

@ -21,20 +21,18 @@
buildPythonPackage rec {
pname = "amaranth";
format = "pyproject";
version = "0.5.2";
version = "0.5.3";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "amaranth-lang";
repo = "amaranth";
rev = "refs/tags/v${version}";
hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo=";
hash = "sha256-lPQw7fAVM7URdyC/9c/UIYsRxVXrLjvHODvhYBdlkkg=";
};
nativeBuildInputs = [
git
pdm-backend
];
nativeBuildInputs = [ git ];
build-system = [ pdm-backend ];
dependencies =
[