Skip to content

Commit 1bf4c70

Browse files
authored
feat(py): update hugr-py dependency to 0.13 (#996)
drive-by devenv update needed to avoid lots of uv lock noise
1 parent c157a36 commit 1bf4c70

File tree

7 files changed

+66
-82
lines changed

7 files changed

+66
-82
lines changed

devenv.lock

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"devenv": {
44
"locked": {
55
"dir": "src/modules",
6-
"lastModified": 1741953770,
6+
"lastModified": 1753386188,
77
"owner": "cachix",
88
"repo": "devenv",
9-
"rev": "984272189d4c23e3663a4d7e83b3cf3a532aa53d",
9+
"rev": "a19c43648f108256e442e46dc32d4eee57c71ac3",
1010
"type": "github"
1111
},
1212
"original": {
@@ -16,33 +16,13 @@
1616
"type": "github"
1717
}
1818
},
19-
"fenix": {
20-
"inputs": {
21-
"nixpkgs": [
22-
"nixpkgs"
23-
],
24-
"rust-analyzer-src": "rust-analyzer-src"
25-
},
26-
"locked": {
27-
"lastModified": 1741934023,
28-
"owner": "nix-community",
29-
"repo": "fenix",
30-
"rev": "4f956eacc9ec619bcd98f4580c663a8749978cc8",
31-
"type": "github"
32-
},
33-
"original": {
34-
"owner": "nix-community",
35-
"repo": "fenix",
36-
"type": "github"
37-
}
38-
},
3919
"flake-compat": {
4020
"flake": false,
4121
"locked": {
42-
"lastModified": 1733328505,
22+
"lastModified": 1747046372,
4323
"owner": "edolstra",
4424
"repo": "flake-compat",
45-
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
25+
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
4626
"type": "github"
4727
},
4828
"original": {
@@ -60,10 +40,10 @@
6040
]
6141
},
6242
"locked": {
63-
"lastModified": 1741379162,
43+
"lastModified": 1750779888,
6444
"owner": "cachix",
6545
"repo": "git-hooks.nix",
66-
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
46+
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
6747
"type": "github"
6848
},
6949
"original": {
@@ -94,10 +74,10 @@
9474
},
9575
"nixpkgs": {
9676
"locked": {
97-
"lastModified": 1741865919,
77+
"lastModified": 1753399495,
9878
"owner": "NixOS",
9979
"repo": "nixpkgs",
100-
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
80+
"rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc",
10181
"type": "github"
10282
},
10383
"original": {
@@ -110,27 +90,30 @@
11090
"root": {
11191
"inputs": {
11292
"devenv": "devenv",
113-
"fenix": "fenix",
11493
"git-hooks": "git-hooks",
11594
"nixpkgs": "nixpkgs",
11695
"pre-commit-hooks": [
11796
"git-hooks"
118-
]
97+
],
98+
"rust-overlay": "rust-overlay"
11999
}
120100
},
121-
"rust-analyzer-src": {
122-
"flake": false,
101+
"rust-overlay": {
102+
"inputs": {
103+
"nixpkgs": [
104+
"nixpkgs"
105+
]
106+
},
123107
"locked": {
124-
"lastModified": 1741895161,
125-
"owner": "rust-lang",
126-
"repo": "rust-analyzer",
127-
"rev": "185f9deb452760f3abc2fde0500398e3198678cd",
108+
"lastModified": 1753411536,
109+
"owner": "oxalica",
110+
"repo": "rust-overlay",
111+
"rev": "7ae12d14d6bb74acfadf31e17a204d928eaf77b8",
128112
"type": "github"
129113
},
130114
"original": {
131-
"owner": "rust-lang",
132-
"ref": "nightly",
133-
"repo": "rust-analyzer",
115+
"owner": "oxalica",
116+
"repo": "rust-overlay",
134117
"type": "github"
135118
}
136119
}

devenv.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
{ pkgs, lib, ... }: let
1+
{ pkgs, lib, ... }:
2+
let
23
llvmVersion = "14";
34
llvmPackages = pkgs."llvmPackages_${llvmVersion}";
45

5-
in {
6+
in
7+
{
68
# https://devenv.sh/packages/
79
# on macos frameworks have to be explicitly specified
810
# otherwise a linker error ocurs on rust packages
@@ -18,13 +20,7 @@ in {
1820
]
1921
++ lib.optionals pkgs.stdenv.isLinux [
2022
pkgs.stdenv.cc.cc.lib
21-
]
22-
++ lib.optionals pkgs.stdenv.isDarwin (
23-
with pkgs.darwin.apple_sdk; [
24-
frameworks.CoreServices
25-
frameworks.CoreFoundation
26-
]
27-
);
23+
];
2824

2925

3026
enterShell = ''

devenv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
inputs:
22
nixpkgs:
33
url: github:NixOS/nixpkgs/nixpkgs-unstable
4-
fenix:
5-
url: github:nix-community/fenix
4+
rust-overlay:
5+
url: github:oxalica/rust-overlay
66
inputs:
77
nixpkgs:
88
follows: nixpkgs

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ dev-dependencies = [
1717
"pip >=24",
1818
]
1919

20+
prerelease = "explicit"
21+
2022
[build-system]
2123
requires = ["hatchling"]
2224
build-backend = "hatchling.build"

tket-exts/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
"Topic :: Scientific/Engineering",
2727
]
2828

29-
dependencies = ['hugr ~= 0.12.0']
29+
dependencies = ['hugr >= 0.13.0rc1,<0.14']
3030

3131
[project.urls]
3232
homepage = "https://github.com/CQCL/tket2/tree/main/tket-exts"

tket-py/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
]
2828

2929
dependencies = [
30-
'hugr ~= 0.12.0',
30+
'hugr >= 0.13.0rc1,<0.14',
3131
"pytket>=1.34,<3",
3232
'tket_eccs ~= 0.4.0',
3333
'tket_exts ~= 0.9.0',

0 commit comments

Comments
 (0)