pyrox.dev
Merge remote-tracking branch 'origin/master' into staging-next
+5
-5
.github/workflows/eval.yml
+5
-5
.github/workflows/eval.yml
···
171
171
run: |
172
172
# Get the latest eval.yml workflow run for the PR's target commit
173
173
if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
174
-
-f head_sha="$BASE_SHA" -f event=push \
174
+
-f head_sha="$TARGET_SHA" -f event=push \
175
175
--jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
176
176
|| [[ -z "$run" ]]; then
177
-
echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison"
178
-
exit 0
177
+
echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
178
+
exit 1
179
179
fi
180
180
echo "Comparing against $(jq .html_url <<< "$run")"
181
181
runId=$(jq .id <<< "$run")
···
189
189
190
190
if [[ "$conclusion" != "success" ]]; then
191
191
echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison"
192
-
exit 0
192
+
exit 1
193
193
fi
194
194
195
195
echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
196
196
env:
197
197
REPOSITORY: ${{ github.repository }}
198
-
BASE_SHA: ${{ needs.attrs.outputs.targetSha }}
198
+
TARGET_SHA: ${{ needs.attrs.outputs.targetSha }}
199
199
GH_TOKEN: ${{ github.token }}
200
200
201
201
- uses: actions/download-artifact@v4
+6
maintainers/maintainer-list.nix
+6
maintainers/maintainer-list.nix
···
5974
5974
githubId = 523628;
5975
5975
name = "Jonathan Strickland";
5976
5976
};
5977
+
djds = {
5978
+
email = "git@djds.dev";
5979
+
github = "djds";
5980
+
githubId = 4218822;
5981
+
name = "djds";
5982
+
};
5977
5983
Dje4321 = {
5978
5984
email = "dje4321@gmail.com";
5979
5985
github = "dje4321";
+2
nixos/doc/manual/release-notes/rl-2505.section.md
+2
nixos/doc/manual/release-notes/rl-2505.section.md
···
149
149
150
150
- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable)
151
151
152
+
- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).
153
+
152
154
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
153
155
154
156
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
+1
nixos/modules/module-list.nix
+1
nixos/modules/module-list.nix
···
925
925
./services/monitoring/gatus.nix
926
926
./services/monitoring/gitwatch.nix
927
927
./services/monitoring/glances.nix
928
+
./services/monitoring/glpi-agent.nix
928
929
./services/monitoring/goss.nix
929
930
./services/monitoring/grafana-agent.nix
930
931
./services/monitoring/grafana-image-renderer.nix
+1
-4
nixos/modules/services/blockchain/ethereum/geth.nix
+1
-4
nixos/modules/services/blockchain/ethereum/geth.nix
+156
nixos/modules/services/misc/recyclarr.nix
+156
nixos/modules/services/misc/recyclarr.nix
···
1
+
{
2
+
config,
3
+
lib,
4
+
pkgs,
5
+
utils,
6
+
...
7
+
}:
8
+
9
+
let
10
+
cfg = config.services.recyclarr;
11
+
format = pkgs.formats.yaml { };
12
+
stateDir = "/var/lib/recyclarr";
13
+
configPath = "${stateDir}/config.json";
14
+
in
15
+
{
16
+
options.services.recyclarr = {
17
+
enable = lib.mkEnableOption "recyclarr service";
18
+
19
+
package = lib.mkPackageOption pkgs "recyclarr" { };
20
+
21
+
configuration = lib.mkOption {
22
+
type = format.type;
23
+
default = { };
24
+
example = {
25
+
sonarr = [
26
+
{
27
+
instance_name = "main";
28
+
base_url = "http://localhost:8989";
29
+
api_key = {
30
+
_secret = "/run/credentials/recyclarr.service/sonarr-api_key";
31
+
};
32
+
}
33
+
];
34
+
radarr = [
35
+
{
36
+
instance_name = "main";
37
+
base_url = "http://localhost:7878";
38
+
api_key = {
39
+
_secret = "/run/credentials/recyclarr.service/radarr-api_key";
40
+
};
41
+
}
42
+
];
43
+
};
44
+
description = lib.mdDoc ''
45
+
Recyclarr YAML configuration as a Nix attribute set.
46
+
47
+
For detailed configuration options and examples, see the
48
+
[official configuration reference](https://recyclarr.dev/wiki/yaml/config-reference/).
49
+
50
+
The configuration is processed using [utils.genJqSecretsReplacementSnippet](https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/utils.nix#L232-L331) to handle secret substitution.
51
+
52
+
To avoid permission issues, secrets should be provided via systemd's credential mechanism:
53
+
54
+
```nix
55
+
systemd.services.recyclarr.serviceConfig.LoadCredential = [
56
+
"radarr-api_key:''${config.sops.secrets.radarr-api_key.path}"
57
+
];
58
+
'';
59
+
};
60
+
61
+
schedule = lib.mkOption {
62
+
type = lib.types.str;
63
+
default = "daily";
64
+
description = "When to run recyclarr in systemd calendar format.";
65
+
};
66
+
67
+
command = lib.mkOption {
68
+
type = lib.types.str;
69
+
default = "sync";
70
+
description = "The recyclarr command to run (e.g., sync).";
71
+
};
72
+
73
+
user = lib.mkOption {
74
+
type = lib.types.str;
75
+
default = "recyclarr";
76
+
description = "User account under which recyclarr runs.";
77
+
};
78
+
79
+
group = lib.mkOption {
80
+
type = lib.types.str;
81
+
default = "recyclarr";
82
+
description = "Group under which recyclarr runs.";
83
+
};
84
+
};
85
+
86
+
config = lib.mkIf cfg.enable {
87
+
88
+
users.users = lib.mkIf (cfg.user == "recyclarr") {
89
+
recyclarr = {
90
+
isSystemUser = true;
91
+
description = "recyclarr user";
92
+
home = stateDir;
93
+
group = cfg.group;
94
+
};
95
+
};
96
+
97
+
users.groups = lib.mkIf (cfg.group == "recyclarr") {
98
+
${cfg.group} = { };
99
+
};
100
+
101
+
systemd.services.recyclarr = {
102
+
description = "Recyclarr Service";
103
+
104
+
# YAML is a JSON super-set
105
+
preStart = utils.genJqSecretsReplacementSnippet cfg.configuration configPath;
106
+
107
+
serviceConfig = {
108
+
Type = "oneshot";
109
+
User = cfg.user;
110
+
Group = cfg.group;
111
+
StateDirectory = "recyclarr";
112
+
ExecStart = "${lib.getExe cfg.package} ${cfg.command} --app-data ${stateDir} --config ${configPath}";
113
+
114
+
ProtectSystem = "strict";
115
+
ProtectHome = true;
116
+
PrivateTmp = true;
117
+
PrivateDevices = true;
118
+
ProtectHostname = true;
119
+
ProtectClock = true;
120
+
ProtectKernelTunables = true;
121
+
ProtectKernelModules = true;
122
+
ProtectKernelLogs = true;
123
+
ProtectControlGroups = true;
124
+
125
+
PrivateNetwork = false;
126
+
RestrictAddressFamilies = [
127
+
"AF_INET"
128
+
"AF_INET6"
129
+
];
130
+
131
+
NoNewPrivileges = true;
132
+
RestrictSUIDSGID = true;
133
+
RemoveIPC = true;
134
+
135
+
ReadWritePaths = [ stateDir ];
136
+
137
+
CapabilityBoundingSet = "";
138
+
139
+
LockPersonality = true;
140
+
RestrictRealtime = true;
141
+
};
142
+
};
143
+
144
+
systemd.timers.recyclarr = {
145
+
description = "Recyclarr Timer";
146
+
wantedBy = [ "timers.target" ];
147
+
partOf = [ "recyclarr.service" ];
148
+
149
+
timerConfig = {
150
+
OnCalendar = cfg.schedule;
151
+
Persistent = true;
152
+
RandomizedDelaySec = "5m";
153
+
};
154
+
};
155
+
};
156
+
}
+91
nixos/modules/services/monitoring/glpi-agent.nix
+91
nixos/modules/services/monitoring/glpi-agent.nix
···
1
+
{
2
+
config,
3
+
lib,
4
+
pkgs,
5
+
...
6
+
}:
7
+
8
+
let
9
+
cfg = config.services.glpiAgent;
10
+
11
+
settingsType =
12
+
with lib.types;
13
+
attrsOf (oneOf [
14
+
bool
15
+
int
16
+
str
17
+
(listOf str)
18
+
]);
19
+
20
+
formatValue =
21
+
v:
22
+
if lib.isBool v then
23
+
if v then "1" else "0"
24
+
else if lib.isList v then
25
+
lib.concatStringsSep "," v
26
+
else
27
+
toString v;
28
+
29
+
configContent = lib.concatStringsSep "\n" (
30
+
lib.mapAttrsToList (k: v: "${k} = ${formatValue v}") cfg.settings
31
+
);
32
+
33
+
configFile = pkgs.writeText "agent.cfg" configContent;
34
+
35
+
in
36
+
{
37
+
options = {
38
+
services.glpiAgent = {
39
+
enable = lib.mkEnableOption "GLPI Agent";
40
+
41
+
package = lib.mkPackageOption pkgs "glpi-agent" { };
42
+
43
+
settings = lib.mkOption {
44
+
type = settingsType;
45
+
default = { };
46
+
description = ''
47
+
GLPI Agent configuration options.
48
+
See https://glpi-agent.readthedocs.io/en/latest/configuration.html for all available options.
49
+
50
+
The 'server' option is mandatory and must point to your GLPI server.
51
+
'';
52
+
example = lib.literalExpression ''
53
+
{
54
+
server = [ "https://glpi.example.com/inventory" ];
55
+
delaytime = 3600;
56
+
tag = "production";
57
+
logger = [ "stderr" "file" ];
58
+
debug = 1;
59
+
"no-category" = [ "printer" "software" ];
60
+
}
61
+
'';
62
+
};
63
+
64
+
stateDir = lib.mkOption {
65
+
type = lib.types.str;
66
+
default = "/var/lib/glpi-agent";
67
+
description = "Directory where GLPI Agent stores its state.";
68
+
};
69
+
};
70
+
};
71
+
72
+
config = lib.mkIf cfg.enable {
73
+
assertions = [
74
+
{
75
+
assertion = cfg.settings ? server;
76
+
message = "GLPI Agent requires a server to be configured in services.glpiAgent.settings.server";
77
+
}
78
+
];
79
+
80
+
systemd.services.glpi-agent = {
81
+
description = "GLPI Agent";
82
+
wantedBy = [ "multi-user.target" ];
83
+
after = [ "network.target" ];
84
+
85
+
serviceConfig = {
86
+
ExecStart = "${lib.getExe cfg.package} --conf-file ${configFile} --vardir ${cfg.stateDir} --daemon --no-fork";
87
+
Restart = "on-failure";
88
+
};
89
+
};
90
+
};
91
+
}
+23
-2
nixos/tests/geth.nix
+23
-2
nixos/tests/geth.nix
···
15
15
enable = true;
16
16
};
17
17
};
18
-
services.geth."testnet" = {
18
+
19
+
services.geth."holesky" = {
19
20
enable = true;
20
21
port = 30304;
21
22
network = "holesky";
···
28
29
port = 18551;
29
30
};
30
31
};
32
+
33
+
services.geth."sepolia" = {
34
+
enable = true;
35
+
port = 30305;
36
+
network = "sepolia";
37
+
http = {
38
+
enable = true;
39
+
port = 28545;
40
+
};
41
+
authrpc = {
42
+
enable = true;
43
+
port = 28551;
44
+
};
45
+
};
31
46
};
32
47
33
48
testScript = ''
34
49
start_all()
35
50
36
51
machine.wait_for_unit("geth-mainnet.service")
37
-
machine.wait_for_unit("geth-testnet.service")
52
+
machine.wait_for_unit("geth-holesky.service")
53
+
machine.wait_for_unit("geth-sepolia.service")
38
54
machine.wait_for_open_port(8545)
39
55
machine.wait_for_open_port(18545)
56
+
machine.wait_for_open_port(28545)
40
57
41
58
machine.succeed(
42
59
'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
···
44
61
45
62
machine.succeed(
46
63
'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
64
+
)
65
+
66
+
machine.succeed(
67
+
'geth attach --exec "eth.blockNumber" http://localhost:28545 | grep \'^0$\' '
47
68
)
48
69
'';
49
70
}
+2
-2
pkgs/applications/networking/instant-messengers/discord/default.nix
+2
-2
pkgs/applications/networking/instant-messengers/discord/default.nix
···
9
9
versions =
10
10
if stdenv.hostPlatform.isLinux then
11
11
{
12
-
stable = "0.0.82";
12
+
stable = "0.0.83";
13
13
ptb = "0.0.128";
14
14
canary = "0.0.581";
15
15
development = "0.0.68";
···
26
26
x86_64-linux = {
27
27
stable = fetchurl {
28
28
url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
29
-
hash = "sha256-L8Lwe5UavmbW1s3gsSJiHjbiZnNtyEsEJzlrN0Fgc3w=";
29
+
hash = "sha256-thBnSYjYa2QEHyxIhEiA73hMs/S8n808oq8IAKtA7VI=";
30
30
};
31
31
ptb = fetchurl {
32
32
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
+1
-1
pkgs/applications/science/logic/why3/default.nix
+1
-1
pkgs/applications/science/logic/why3/default.nix
+6
-6
pkgs/applications/version-management/gitlab/data.json
+6
-6
pkgs/applications/version-management/gitlab/data.json
···
1
1
{
2
-
"version": "17.8.0",
3
-
"repo_hash": "0a6a05hip2f505yvfi4v7849cmpb1kzghsf6ivy6lrhc06ksxs19",
2
+
"version": "17.8.1",
3
+
"repo_hash": "17m0aw8gd58gs1vxzk6pbqnhrhkvc172kn47pj5p6sgq3li3mcgf",
4
4
"yarn_hash": "0d1nzgji3y90gcx92pl0bnqlj5h9ra3r7k1z673fvsj6lzppnx8v",
5
5
"owner": "gitlab-org",
6
6
"repo": "gitlab",
7
-
"rev": "v17.8.0-ee",
7
+
"rev": "v17.8.1-ee",
8
8
"passthru": {
9
-
"GITALY_SERVER_VERSION": "17.8.0",
10
-
"GITLAB_PAGES_VERSION": "17.8.0",
9
+
"GITALY_SERVER_VERSION": "17.8.1",
10
+
"GITLAB_PAGES_VERSION": "17.8.1",
11
11
"GITLAB_SHELL_VERSION": "14.39.0",
12
12
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
13
-
"GITLAB_WORKHORSE_VERSION": "17.8.0"
13
+
"GITLAB_WORKHORSE_VERSION": "17.8.1"
14
14
}
15
15
}
+1
-1
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+1
-1
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+2
-2
pkgs/by-name/as/astroterm/package.nix
+2
-2
pkgs/by-name/as/astroterm/package.nix
···
13
13
14
14
stdenv.mkDerivation (finalAttrs: {
15
15
pname = "astroterm";
16
-
version = "1.0.4";
16
+
version = "1.0.6";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "da-luce";
20
20
repo = "astroterm";
21
21
tag = "v${finalAttrs.version}";
22
-
hash = "sha256-CYKW/RAQ3a5238cojbpGfTenMQApfaZOHnQMrZ6LWzA=";
22
+
hash = "sha256-BjqurPp0WI/wI5n2TibnyOqZ3NjRcLYB2MxqqNvTQtw=";
23
23
};
24
24
25
25
bsc5File = fetchurl {
+2
-1
pkgs/by-name/au/audible-cli/package.nix
+2
-1
pkgs/by-name/au/audible-cli/package.nix
···
2
2
lib,
3
3
python3Packages,
4
4
fetchFromGitHub,
5
+
addBinToPathHook,
5
6
installShellFiles,
6
7
nix-update-script,
7
8
}:
···
24
25
setuptools
25
26
]
26
27
++ [
28
+
addBinToPathHook
27
29
installShellFiles
28
30
];
29
31
···
46
48
];
47
49
48
50
postInstall = ''
49
-
export PATH=$out/bin:$PATH
50
51
installShellCompletion --cmd audible \
51
52
--bash <(source utils/code_completion/audible-complete-bash.sh) \
52
53
--fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \
+2
-2
pkgs/by-name/az/azure-cli/extensions-manual.nix
+2
-2
pkgs/by-name/az/azure-cli/extensions-manual.nix
···
126
126
127
127
storage-preview = mkAzExtension rec {
128
128
pname = "storage-preview";
129
-
version = "1.0.0b2";
129
+
version = "1.0.0b5";
130
130
url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl";
131
-
hash = "sha256-Lej6QhYikoowi7cASMP99AQAutOzSv1gHQs6/Ni4J2Q=";
131
+
hash = "sha256-gs4uQrnpXm03iPyP+i5DnFWvQ43+ZHN4wSZiNRVZU7g=";
132
132
description = "Provides a preview for upcoming storage features";
133
133
propagatedBuildInputs = with python3Packages; [ azure-core ];
134
134
meta.maintainers = with lib.maintainers; [ katexochen ];
+2
-2
pkgs/by-name/ce/cedar/package.nix
+2
-2
pkgs/by-name/ce/cedar/package.nix
···
9
9
10
10
rustPlatform.buildRustPackage rec {
11
11
pname = "cedar";
12
-
version = "4.3.0";
12
+
version = "4.3.1";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "cedar-policy";
16
16
repo = "cedar";
17
17
tag = "v${version}";
18
-
hash = "sha256-E3x+FfjLNUpfu00D+UALc73STodNW2Kvfo/4x6hORiY=";
18
+
hash = "sha256-1EJvLQDQQTiNwPe0Ynt6VI3RD/3jGbt/0H7pzGcl1wA=";
19
19
};
20
20
21
21
useFetchCargoVendor = true;
+3
-12
pkgs/by-name/cl/cloud-hypervisor/package.nix
+3
-12
pkgs/by-name/cl/cloud-hypervisor/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitHub,
5
-
fetchpatch,
6
5
rustPlatform,
7
6
pkg-config,
8
7
dtc,
···
11
10
12
11
rustPlatform.buildRustPackage rec {
13
12
pname = "cloud-hypervisor";
14
-
version = "43.0";
13
+
version = "44.0";
15
14
16
15
src = fetchFromGitHub {
17
16
owner = "cloud-hypervisor";
18
17
repo = pname;
19
18
rev = "v${version}";
20
-
hash = "sha256-drxJtlvBpkK3I7Ob3+pH4KLUq53GWXe1pmv7CI3bbP4=";
19
+
hash = "sha256-2nA8bhezmGa6Gu420nxDrgW0SonTQv1WoGYmBwm7/bI=";
21
20
};
22
21
23
-
cargoPatches = [
24
-
(fetchpatch {
25
-
name = "kvm-ioctls-0.19.1.patch";
26
-
url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/eaa21946993276434403d41419a34e564935c8e9.patch";
27
-
hash = "sha256-G7B0uGl/RAkwub8x1jNNgBrC0dwq/Gv46XpbtTZWD5M=";
28
-
})
29
-
];
30
-
31
22
useFetchCargoVendor = true;
32
-
cargoHash = "sha256-F6ukvSwMHRHXoZKgXEFnTAN1B80GsQDW8iqZAvsREr4=";
23
+
cargoHash = "sha256-e2VbzBPfoy5+YrqZ5mkbxMLpQIOG0x5tIhNG6Tv+u0M=";
33
24
34
25
separateDebugInfo = true;
35
26
+2
pkgs/by-name/da/daq/package.nix
+2
pkgs/by-name/da/daq/package.nix
+2
-5
pkgs/by-name/el/eliot-tree/package.nix
+2
-5
pkgs/by-name/el/eliot-tree/package.nix
···
2
2
lib,
3
3
python3Packages,
4
4
fetchPypi,
5
+
addBinToPathHook,
5
6
}:
6
7
7
8
python3Packages.buildPythonApplication rec {
···
32
33
];
33
34
34
35
nativeCheckInputs = with python3Packages; [
36
+
addBinToPathHook
35
37
pytestCheckHook
36
38
testtools
37
39
];
38
-
39
-
# Tests run eliot-tree in out/bin.
40
-
preCheck = ''
41
-
export PATH=$out/bin:$PATH
42
-
'';
43
40
44
41
pythonImportsCheck = [ "eliottree" ];
45
42
+46
pkgs/by-name/en/ente-auth/fetch-git-hashes.py
+46
pkgs/by-name/en/ente-auth/fetch-git-hashes.py
···
1
+
#!/usr/bin/env nix-shell
2
+
#!nix-shell -i python3 -p nix-prefetch-git
3
+
4
+
from dataclasses import dataclass
5
+
import json
6
+
import subprocess
7
+
8
+
9
+
@dataclass
10
+
class GitDependency:
11
+
name: str
12
+
url: str
13
+
revision: str
14
+
15
+
16
+
def get_git_deps(lock_data):
17
+
for name, data in lock_data["packages"].items():
18
+
if data["source"] == "git":
19
+
desc = data["description"]
20
+
yield GitDependency(
21
+
name=name,
22
+
url=desc["url"],
23
+
revision=desc["resolved-ref"],
24
+
)
25
+
26
+
27
+
def nix_prefetch_git(url: str, rev: str):
28
+
result = subprocess.run(
29
+
["nix-prefetch-git", url, rev],
30
+
check=True,
31
+
text=True,
32
+
stdout=subprocess.PIPE,
33
+
)
34
+
return json.loads(result.stdout)
35
+
36
+
37
+
if __name__ == "__main__":
38
+
with open("pubspec.lock.json") as lock_file:
39
+
lock_data = json.load(lock_file)
40
+
git_hashes = {}
41
+
for dep in get_git_deps(lock_data):
42
+
data = nix_prefetch_git(dep.url, dep.revision)
43
+
git_hashes[dep.name] = data["hash"]
44
+
with open("git-hashes.json", "w") as output_file:
45
+
json.dump(git_hashes, output_file, indent=2)
46
+
output_file.write("\n")
+6
pkgs/by-name/en/ente-auth/git-hashes.json
+6
pkgs/by-name/en/ente-auth/git-hashes.json
···
1
+
{
2
+
"ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
3
+
"flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
4
+
"flutter_secure_storage_linux": "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=",
5
+
"sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
6
+
}
+3
-10
pkgs/by-name/en/ente-auth/package.nix
+3
-10
pkgs/by-name/en/ente-auth/package.nix
···
17
17
in
18
18
flutter324.buildFlutterApplication rec {
19
19
pname = "ente-auth";
20
-
version = "4.2.8";
20
+
version = "4.3.2";
21
21
22
22
src = fetchFromGitHub {
23
23
owner = "ente-io";
24
24
repo = "ente";
25
25
sparseCheckout = [ "auth" ];
26
26
tag = "auth-v${version}";
27
-
hash = "sha256-1vIM2MrQF0DO+5SEzIAUeZxOks6PKs3kkTdc09aCk2A=";
27
+
hash = "sha256-/WWodQcMibwXVexI+XbTZYRkIMtfNHk3bJVBPJHcoqI=";
28
28
};
29
29
30
30
sourceRoot = "${src.name}/auth";
31
31
32
32
pubspecLock = lib.importJSON ./pubspec.lock.json;
33
+
gitHashes = lib.importJSON ./git-hashes.json;
33
34
34
35
patches = [
35
36
# Disable update notifications and auto-update functionality
···
40
41
rmdir assets/simple-icons
41
42
ln -s ${simple-icons} assets/simple-icons
42
43
'';
43
-
44
-
gitHashes = {
45
-
desktop_webview_window = "sha256-jdNMpzFBgw53asWlGzWUS+hoPdzcL6kcJt2KzjxXf2E=";
46
-
ente_crypto_dart = "sha256-XBzQ268E0cYljJH6gDS5O0Pmie/GwuhMDlQPfopSqJM=";
47
-
flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=";
48
-
flutter_secure_storage_linux = "sha256-x45jrJ7pvVyhZlpqRSy3CbwT4Lna6yi/b2IyAilWckg=";
49
-
sqflite = "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA=";
50
-
};
51
44
52
45
nativeBuildInputs = [
53
46
copyDesktopItems
+1
-11
pkgs/by-name/en/ente-auth/pubspec.lock.json
+1
-11
pkgs/by-name/en/ente-auth/pubspec.lock.json
···
481
481
"description": {
482
482
"path": ".",
483
483
"ref": "HEAD",
484
-
"resolved-ref": "e2e66ffd03f23bef5e0bb138b5f01b32d8e9b7bb",
484
+
"resolved-ref": "f91e1545f8263df127762240c4da54a0c42835b2",
485
485
"url": "https://github.com/ente-io/ente_crypto_dart.git"
486
486
},
487
487
"source": "git",
···
1622
1622
},
1623
1623
"source": "hosted",
1624
1624
"version": "4.1.0"
1625
-
},
1626
-
"scan": {
1627
-
"dependency": "direct main",
1628
-
"description": {
1629
-
"name": "scan",
1630
-
"sha256": "b343ec36f863a88d41eb4c174b810c055c6bd1f1822b2188ab31aab684fb7cdb",
1631
-
"url": "https://pub.dev"
1632
-
},
1633
-
"source": "hosted",
1634
-
"version": "1.6.0"
1635
1625
},
1636
1626
"screen_retriever": {
1637
1627
"dependency": "transitive",
+9
-2
pkgs/by-name/en/ente-auth/update.sh
+9
-2
pkgs/by-name/en/ente-auth/update.sh
···
19
19
# Subtree needed for lockfile and icons
20
20
auth_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
21
21
22
+
pushd "$pkg_dir"
23
+
22
24
# Get lockfile, filter out incompatible sqlite dependency and convert to JSON
23
25
echo "Updating lockfile"
24
26
pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
25
-
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > "$pkg_dir/pubspec.lock.json"
27
+
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > pubspec.lock.json
28
+
29
+
echo "Updating git hashes"
30
+
./fetch-git-hashes.py
26
31
27
32
# Get rev and hash of simple-icons submodule
28
33
echo "Updating icons"
29
34
assets_tree="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "assets") | .url' --raw-output)"
30
35
simple_icons_rev="$(gh-curl "$assets_tree" | gojq '.tree[] | select(.path == "simple-icons") | .sha' --raw-output)"
31
-
nix-prefetch-github --rev "$simple_icons_rev" simple-icons simple-icons > "$pkg_dir/simple-icons.json"
36
+
nix-prefetch-github --rev "$simple_icons_rev" simple-icons simple-icons > simple-icons.json
37
+
38
+
popd
32
39
33
40
# Update package version and hash
34
41
echo "Updating package source"
+5
-5
pkgs/by-name/fl/flye/package.nix
+5
-5
pkgs/by-name/fl/flye/package.nix
···
8
8
libdeflate,
9
9
bash,
10
10
coreutils,
11
+
addBinToPathHook,
11
12
}:
12
13
13
14
python3Packages.buildPythonApplication rec {
···
54
55
55
56
pythonImportsCheck = [ "flye" ];
56
57
57
-
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
58
-
59
-
preCheck = ''
60
-
export PATH=$out/bin:$PATH
61
-
'';
58
+
nativeCheckInputs = [
59
+
addBinToPathHook
60
+
python3Packages.pytestCheckHook
61
+
];
62
62
63
63
meta = with lib; {
64
64
description = "De novo assembler for single molecule sequencing reads using repeat graphs";
+2
-2
pkgs/by-name/fw/fwupd/package.nix
+2
-2
pkgs/by-name/fw/fwupd/package.nix
···
117
117
in
118
118
stdenv.mkDerivation (finalAttrs: {
119
119
pname = "fwupd";
120
-
version = "2.0.4";
120
+
version = "2.0.5";
121
121
122
122
# libfwupd goes to lib
123
123
# daemon, plug-ins and libfwupdplugin go to out
···
135
135
owner = "fwupd";
136
136
repo = "fwupd";
137
137
tag = finalAttrs.version;
138
-
hash = "sha256-0+2B8/ZuniZCeP1LMzLcJsvE3RzlHuw0jd6rlkoW6zY=";
138
+
hash = "sha256-V07alPn2+bOkKx+oh8qoX4Ie6/5ujO6h/TDzvL3UhvQ=";
139
139
};
140
140
141
141
patches = [
+10
-8
pkgs/by-name/ga/gallia/package.nix
+10
-8
pkgs/by-name/ga/gallia/package.nix
···
3
3
fetchFromGitHub,
4
4
python3,
5
5
cacert,
6
+
addBinToPathHook,
6
7
}:
7
8
8
9
python3.pkgs.buildPythonApplication rec {
···
43
44
44
45
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
45
46
46
-
nativeCheckInputs = with python3.pkgs; [
47
-
pytestCheckHook
48
-
pytest-asyncio
49
-
];
47
+
nativeCheckInputs =
48
+
with python3.pkgs;
49
+
[
50
+
pytestCheckHook
51
+
pytest-asyncio
52
+
]
53
+
++ [
54
+
addBinToPathHook
55
+
];
50
56
51
57
pythonImportsCheck = [ "gallia" ];
52
-
53
-
preCheck = ''
54
-
export PATH=$out/bin:$PATH
55
-
'';
56
58
57
59
meta = with lib; {
58
60
description = "Extendable Pentesting Framework for the Automotive Domain";
+13
-13
pkgs/by-name/gd/gdtoolkit_3/package.nix
+13
-13
pkgs/by-name/gd/gdtoolkit_3/package.nix
···
2
2
lib,
3
3
python3,
4
4
fetchFromGitHub,
5
+
addBinToPathHook,
6
+
writableTmpDirAsHomeHook,
5
7
}:
6
8
7
9
let
···
31
33
src = fetchFromGitHub {
32
34
owner = "Scony";
33
35
repo = "godot-gdscript-toolkit";
34
-
rev = version;
36
+
tag = version;
35
37
hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4=";
36
38
};
37
39
···
46
48
47
49
doCheck = true;
48
50
49
-
nativeCheckInputs = with python.pkgs; [
50
-
pytestCheckHook
51
-
hypothesis
52
-
];
53
-
54
-
preCheck = ''
55
-
# The tests want to run the installed executables
56
-
export PATH=$out/bin:$PATH
57
-
58
-
# gdtoolkit tries to write cache variables to $HOME/.cache
59
-
export HOME=$TMP
60
-
'';
51
+
nativeCheckInputs =
52
+
with python.pkgs;
53
+
[
54
+
pytestCheckHook
55
+
hypothesis
56
+
]
57
+
++ [
58
+
addBinToPathHook
59
+
writableTmpDirAsHomeHook
60
+
];
61
61
62
62
# The tests are not working on NixOS
63
63
disabledTests = [
+13
-13
pkgs/by-name/gd/gdtoolkit_4/package.nix
+13
-13
pkgs/by-name/gd/gdtoolkit_4/package.nix
···
2
2
lib,
3
3
python3,
4
4
fetchFromGitHub,
5
+
addBinToPathHook,
6
+
writableTmpDirAsHomeHook,
5
7
}:
6
8
7
9
let
···
30
32
src = fetchFromGitHub {
31
33
owner = "Scony";
32
34
repo = "godot-gdscript-toolkit";
33
-
rev = version;
35
+
tag = version;
34
36
hash = "sha256-XK6s/WnbTzjCAtV8dbRPLe5olpKUglPLQdttRRMvX70=";
35
37
};
36
38
···
45
47
46
48
doCheck = true;
47
49
48
-
nativeCheckInputs = with python.pkgs; [
49
-
pytestCheckHook
50
-
hypothesis
51
-
];
52
-
53
-
preCheck = ''
54
-
# The tests want to run the installed executables
55
-
export PATH=$out/bin:$PATH
56
-
57
-
# gdtoolkit tries to write cache variables to $HOME/.cache
58
-
export HOME=$TMP
59
-
'';
50
+
nativeCheckInputs =
51
+
with python.pkgs;
52
+
[
53
+
pytestCheckHook
54
+
hypothesis
55
+
]
56
+
++ [
57
+
addBinToPathHook
58
+
writableTmpDirAsHomeHook
59
+
];
60
60
61
61
# The tests are not working on NixOS
62
62
disabledTestPaths = [
+11
-9
pkgs/by-name/ge/gemmi/package.nix
+11
-9
pkgs/by-name/ge/gemmi/package.nix
···
5
5
cmake,
6
6
zlib,
7
7
enablePython ? true,
8
+
addBinToPathHook,
8
9
python3Packages,
9
10
testers,
10
11
}:
···
44
45
45
46
doInstallCheck = enablePython;
46
47
47
-
nativeInstallCheckInputs = with python3Packages; [
48
-
# biopython
49
-
numpy
50
-
pytestCheckHook
51
-
];
52
-
53
-
preInstallCheck = ''
54
-
export PATH=$out/bin:$PATH
55
-
'';
48
+
nativeInstallCheckInputs =
49
+
with python3Packages;
50
+
[
51
+
# biopython
52
+
numpy
53
+
pytestCheckHook
54
+
]
55
+
++ [
56
+
addBinToPathHook
57
+
];
56
58
57
59
pytestFlagsArray = [ "../tests" ];
58
60
+2
-2
pkgs/by-name/gi/gitaly/package.nix
+2
-2
pkgs/by-name/gi/gitaly/package.nix
···
7
7
}:
8
8
9
9
let
10
-
version = "17.8.0";
10
+
version = "17.8.1";
11
11
package_version = "v${lib.versions.major version}";
12
12
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
13
13
···
21
21
owner = "gitlab-org";
22
22
repo = "gitaly";
23
23
rev = "v${version}";
24
-
hash = "sha256-Ofmhyz4sCcho+tVhAD/X+3BtsrUoysvxHpxwc52Abwc=";
24
+
hash = "sha256-ahYvfA1PvB/OP3swTABH++pZubejsb3Cohy+Z5fcAo4=";
25
25
};
26
26
27
27
vendorHash = "sha256-rR3dsKUoIVDj0NviN8p8g3mSAW8PTNChBacqd23yDf8=";
+2
-2
pkgs/by-name/gi/gitlab-pages/package.nix
+2
-2
pkgs/by-name/gi/gitlab-pages/package.nix
···
6
6
7
7
buildGoModule rec {
8
8
pname = "gitlab-pages";
9
-
version = "17.8.0";
9
+
version = "17.8.1";
10
10
11
11
# nixpkgs-update: no auto update
12
12
src = fetchFromGitLab {
13
13
owner = "gitlab-org";
14
14
repo = "gitlab-pages";
15
15
rev = "v${version}";
16
-
hash = "sha256-jQwHVSedAtBL5A0Y6OTtpRonSG1k69wdZO011S0D8/E=";
16
+
hash = "sha256-h+8sgBWYBClrfIsvnD1cUMRE9cxOtfjrGpss2tYdzDg=";
17
17
};
18
18
19
19
vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE=";
+2
-2
pkgs/by-name/go/go-ethereum/package.nix
+2
-2
pkgs/by-name/go/go-ethereum/package.nix
···
72
72
homepage = "https://geth.ethereum.org/";
73
73
description = "Official golang implementation of the Ethereum protocol";
74
74
license = with licenses; [
75
-
lgpl3Plus
76
-
gpl3Plus
75
+
lgpl3Only
76
+
gpl3Only
77
77
];
78
78
maintainers = with maintainers; [ RaghavSood ];
79
79
mainProgram = "geth";
+2
-2
pkgs/by-name/le/lean4/package.nix
+2
-2
pkgs/by-name/le/lean4/package.nix
···
13
13
14
14
stdenv.mkDerivation (finalAttrs: {
15
15
pname = "lean4";
16
-
version = "4.15.0";
16
+
version = "4.16.0";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "leanprover";
20
20
repo = "lean4";
21
21
rev = "v${finalAttrs.version}";
22
-
hash = "sha256-Xzuk41voBP93vsl3u/bBii9Y6DMfvi6UazKiLLABgHA=";
22
+
hash = "sha256-RdFTxLk0Yahwhu/oQeTappvWnUtnim63dxN7gmU8Jt8=";
23
23
};
24
24
25
25
postPatch = ''
+2
-2
pkgs/by-name/ma/mangojuice/package.nix
+2
-2
pkgs/by-name/ma/mangojuice/package.nix
···
22
22
}:
23
23
stdenv.mkDerivation (finalAttrs: {
24
24
pname = "mangojuice";
25
-
version = "0.8.0";
25
+
version = "0.8.1";
26
26
27
27
src = fetchFromGitHub {
28
28
owner = "radiolamp";
29
29
repo = "mangojuice";
30
30
tag = finalAttrs.version;
31
-
hash = "sha256-LSwn6PIAGX1FIofnmoM2eqnhZBa3gkhlOBUJtdR9gWE=";
31
+
hash = "sha256-nMLymCOkml5LIvZgvp1NNHyG06KVlmQBMU+N4A4/Xus=";
32
32
};
33
33
34
34
nativeBuildInputs = [
+3
-3
pkgs/by-name/mu/mubeng/package.nix
+3
-3
pkgs/by-name/mu/mubeng/package.nix
···
6
6
7
7
buildGoModule rec {
8
8
pname = "mubeng";
9
-
version = "0.21.0";
9
+
version = "0.22.0";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "kitabisa";
13
13
repo = "mubeng";
14
14
tag = "v${version}";
15
-
hash = "sha256-LApviKG6sgIYtosU0xW4lkBH0iB7MGB4bfG9fPI16iQ=";
15
+
hash = "sha256-YK3a975l/gMCaWxTB4gEQWAzzX+GRnYSvKksPmp3ZRA=";
16
16
};
17
17
18
-
vendorHash = "sha256-Uvxkvj5hodVQ0j05HZdSKammGWy9DxEIBT0VnCW8QuI=";
18
+
vendorHash = "sha256-qv8gAq7EohMNbwTfLeNhucKAzkYKzRbTpkoG5jTgKI0=";
19
19
20
20
ldflags = [
21
21
"-s"
+15
-10
pkgs/by-name/mu/multiqc/package.nix
+15
-10
pkgs/by-name/mu/multiqc/package.nix
···
5
5
procps,
6
6
stdenv,
7
7
versionCheckHook,
8
+
addBinToPathHook,
8
9
}:
9
10
10
11
python3Packages.buildPythonApplication rec {
···
77
78
preCheck = ''
78
79
chmod -R u+w ../test-data
79
80
ln -s ../test-data .
80
-
export PATH=$out/bin:$PATH
81
81
'';
82
82
83
83
# Some tests run subprocess.run() with "ps"
84
-
nativeCheckInputs = with python3Packages; [
85
-
procps
86
-
pytest-cov
87
-
pytest-xdist
88
-
pytestCheckHook
89
-
syrupy
90
-
pygithub
91
-
versionCheckHook
92
-
];
84
+
nativeCheckInputs =
85
+
with python3Packages;
86
+
[
87
+
procps
88
+
pytest-cov
89
+
pytest-xdist
90
+
pytestCheckHook
91
+
syrupy
92
+
pygithub
93
+
versionCheckHook
94
+
]
95
+
++ [
96
+
addBinToPathHook
97
+
];
93
98
94
99
versionCheckProgramArg = [ "--version" ];
95
100
+2
-2
pkgs/by-name/my/myks/package.nix
+2
-2
pkgs/by-name/my/myks/package.nix
···
9
9
10
10
buildGoModule rec {
11
11
pname = "myks";
12
-
version = "4.3.1";
12
+
version = "4.4.2";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "mykso";
16
16
repo = "myks";
17
17
tag = "v${version}";
18
-
hash = "sha256-KTz6Tip6kz8AcRW73+MUHUvwr/QT9Z2CvHQNyFXD054=";
18
+
hash = "sha256-95vqUViXUdLLnpsX81bwS1/EAiJA4XzOCIEd43E4wIQ=";
19
19
};
20
20
21
21
vendorHash = "sha256-cTRyQu3lXrIrBHtEYYQIdv0F705KrgyXgDS8meHVRJw=";
+41
-6
pkgs/by-name/ne/nexusmods-app/deps.json
+41
-6
pkgs/by-name/ne/nexusmods-app/deps.json
···
780
780
"hash": "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="
781
781
},
782
782
{
783
+
"pname": "Jamarino.IntervalTree",
784
+
"version": "1.2.2",
785
+
"hash": "sha256-L8vFWl+1OUviHB+TOkw7Po0+IBLnJMZ1fnvqcYQOuRQ="
786
+
},
787
+
{
783
788
"pname": "JetBrains.Annotations",
784
789
"version": "2024.3.0",
785
790
"hash": "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc="
786
791
},
787
792
{
793
+
"pname": "Jitbit.FastCache",
794
+
"version": "1.1.0",
795
+
"hash": "sha256-UJjNHEyBsi+XRkTF/D5EIIhVMchybD9INtXthXo49bg="
796
+
},
797
+
{
788
798
"pname": "K4os.Compression.LZ4",
789
799
"version": "1.3.7-beta",
790
800
"hash": "sha256-mMNIMLSXnKFF3oAgX+k/n0wipxyRDGE1z2BrI2+7ALc="
···
798
808
"pname": "LinqGen",
799
809
"version": "0.3.1",
800
810
"hash": "sha256-Yyt1uShHigHVCIjPT8jL2Kth9L9yq1MGrCM5w2+tj9o="
811
+
},
812
+
{
813
+
"pname": "LinuxDesktopUtils.XDGDesktopPortal",
814
+
"version": "1.0.0",
815
+
"hash": "sha256-DTxWI/DI01Flb4yfSxukaEw6roSzD9iy4Twy1I8/5Mg="
801
816
},
802
817
{
803
818
"pname": "LiveChartsCore",
···
893
908
"pname": "Microsoft.Bcl.AsyncInterfaces",
894
909
"version": "7.0.0",
895
910
"hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
911
+
},
912
+
{
913
+
"pname": "Microsoft.Bcl.AsyncInterfaces",
914
+
"version": "8.0.0",
915
+
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
896
916
},
897
917
{
898
918
"pname": "Microsoft.Build.Tasks.Git",
···
1606
1626
},
1607
1627
{
1608
1628
"pname": "NexusMods.MnemonicDB",
1609
-
"version": "0.9.97",
1610
-
"hash": "sha256-b0k/hM6UYvMTZN2QMk53QN9Fw/pomXJ88k9QqfrAF+s="
1629
+
"version": "0.9.98",
1630
+
"hash": "sha256-1B1PBH/iUuLOPsUo5WAsSAkDGWQBTlY8sk/sAiugpB0="
1611
1631
},
1612
1632
{
1613
1633
"pname": "NexusMods.MnemonicDB.Abstractions",
1614
-
"version": "0.9.97",
1615
-
"hash": "sha256-EnWQMeXMKwziMoBXKf7t+Ru6EHZBml4Pt3h1eSP1Ud0="
1634
+
"version": "0.9.98",
1635
+
"hash": "sha256-rZ9UP6BcxYPlHKqyGj0G5q+woEjvpRS/jg69UY4aWDE="
1616
1636
},
1617
1637
{
1618
1638
"pname": "NexusMods.MnemonicDB.SourceGenerator",
1619
-
"version": "0.9.97",
1620
-
"hash": "sha256-KOZVhS3H/qY6bRW9HmSF1Ud4fXv5oEWORDdYET9Ochw="
1639
+
"version": "0.9.98",
1640
+
"hash": "sha256-jP07gJZQ9ZT9DXyWIQOlgmZx0onqiUe3w2JiN55NA94="
1621
1641
},
1622
1642
{
1623
1643
"pname": "NexusMods.Paths",
···
1638
1658
"pname": "NexusMods.Paths.TestingHelpers",
1639
1659
"version": "0.15.0",
1640
1660
"hash": "sha256-xUZIAND1Ob0SRuoTTuJqw7N2j/4ncIlck3lgfeWxd5M="
1661
+
},
1662
+
{
1663
+
"pname": "NLog",
1664
+
"version": "5.2.8",
1665
+
"hash": "sha256-IrCChiy703DRIebN//M4wwXW7gayuCVD/dHKXCoQcPw="
1641
1666
},
1642
1667
{
1643
1668
"pname": "NLog",
···
2163
2188
"pname": "SkiaSharp.NativeAssets.Win32",
2164
2189
"version": "2.88.9",
2165
2190
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
2191
+
},
2192
+
{
2193
+
"pname": "SmartFormat",
2194
+
"version": "3.5.1",
2195
+
"hash": "sha256-NwvJBCT2BBfJgGa/LMbvan0XqZhRBYzlpMLtC3l5SOM="
2166
2196
},
2167
2197
{
2168
2198
"pname": "Spectre.Console",
···
3078
3108
"pname": "TextMateSharp.Grammars",
3079
3109
"version": "1.0.64",
3080
3110
"hash": "sha256-ykBZOyvaX1/iFmZjue754qJG4jfPx38ZdHevEZvh7w8="
3111
+
},
3112
+
{
3113
+
"pname": "Tmds.DBus.Protocol",
3114
+
"version": "0.18.0",
3115
+
"hash": "sha256-u5bRK7XbxU/NdMu8PZqxb3fmRdPTbimQ/YIe5/scPOo="
3081
3116
},
3082
3117
{
3083
3118
"pname": "Tmds.DBus.Protocol",
+2
-2
pkgs/by-name/ne/nexusmods-app/package.nix
+2
-2
pkgs/by-name/ne/nexusmods-app/package.nix
···
25
25
in
26
26
buildDotnetModule (finalAttrs: {
27
27
inherit pname;
28
-
version = "0.7.2";
28
+
version = "0.7.3";
29
29
30
30
src = fetchgit {
31
31
url = "https://github.com/Nexus-Mods/NexusMods.App.git";
32
32
rev = "refs/tags/v${finalAttrs.version}";
33
-
hash = "sha256-Kss1K1ZqXLZ/WbbyY3ZQRe8Kvmjdu3tRGfcagE7Q42Q=";
33
+
hash = "sha256-p3MTxuLR/mkVrL+hwW2R13/eVHWWulZPRh9OsuHq9kU=";
34
34
fetchSubmodules = true;
35
35
fetchLFS = true;
36
36
};
+2
-2
pkgs/by-name/no/nom/package.nix
+2
-2
pkgs/by-name/no/nom/package.nix
···
5
5
}:
6
6
buildGoModule rec {
7
7
pname = "nom";
8
-
version = "2.7.3";
8
+
version = "2.8.0";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "guyfedwards";
12
12
repo = "nom";
13
13
tag = "v${version}";
14
-
hash = "sha256-kCvNUvU3fR3v/uRPl3y9HlNXMartNb23kfj1YYY2BWg=";
14
+
hash = "sha256-2YXecurdmlho5LvkkMc97GiyrSy/kTZINTPtC+J+eL0=";
15
15
};
16
16
17
17
vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
+2
-2
pkgs/by-name/no/novelwriter/package.nix
+2
-2
pkgs/by-name/no/novelwriter/package.nix
···
7
7
nix-update-script,
8
8
}:
9
9
let
10
-
version = "2.6";
10
+
version = "2.6.1";
11
11
in
12
12
python3.pkgs.buildPythonApplication {
13
13
pname = "novelwriter";
···
18
18
owner = "vkbo";
19
19
repo = "novelWriter";
20
20
rev = "v${version}";
21
-
hash = "sha256-eQ0az+4SEpf07rlCHGvK8Fp8ECimpTblWNlxwANNisE=";
21
+
hash = "sha256-z2iDRTWiqdjEpqCn4pNthNFl/zGGoVLU/XsRJaQ3Ys4=";
22
22
};
23
23
24
24
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+12
pkgs/by-name/op/openmpi/package.nix
+12
pkgs/by-name/op/openmpi/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchurl,
5
+
fetchpatch,
5
6
removeReferencesTo,
6
7
gfortran,
7
8
perl,
···
46
47
url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
47
48
sha256 = "sha256-vUGD/LxDR3wlR5m0Kd8abldsBC50otL4s31Tey/5gVc=";
48
49
};
50
+
51
+
patches = [
52
+
# This patch can be removed with the next openmpi update (>5.0.6)
53
+
# See https://github.com/open-mpi/ompi/issues/12784 and https://github.com/open-mpi/ompi/pull/13003
54
+
# Fixes issue where the shared memory backing file cannot be created because directory trees are never created
55
+
(fetchpatch {
56
+
name = "fix-singletons-session-dir";
57
+
url = "https://github.com/open-mpi/ompi/commit/4d4f7212decd0d0ca719688b15dc9b3ee7553a52.patch";
58
+
hash = "sha256-Mb8qXtAUhAQ90v0SdL24BoTASsKRq2Gu8nYqoeSc9DI=";
59
+
})
60
+
];
49
61
50
62
postPatch = ''
51
63
patchShebangs ./
+15
-16
pkgs/by-name/pa/parquet-tools/package.nix
+15
-16
pkgs/by-name/pa/parquet-tools/package.nix
···
2
2
lib,
3
3
fetchFromGitHub,
4
4
python3Packages,
5
+
addBinToPathHook,
5
6
}:
6
7
7
-
with python3Packages;
8
-
9
-
buildPythonApplication rec {
8
+
python3Packages.buildPythonApplication rec {
10
9
pname = "parquet-tools";
11
10
version = "0.2.16";
12
11
···
27
26
28
27
postPatch = ''
29
28
substituteInPlace tests/test_inspect.py \
30
-
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
29
+
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${python3Packages.pyarrow.version}" \
31
30
--replace "serialized_size: 2222" "serialized_size: 2221" \
32
31
--replace "format_version: 1.0" "format_version: 2.6"
33
32
'';
···
38
37
"thrift"
39
38
];
40
39
41
-
nativeBuildInputs = [
40
+
nativeBuildInputs = with python3Packages; [
42
41
poetry-core
43
42
];
44
43
45
-
propagatedBuildInputs = [
44
+
propagatedBuildInputs = with python3Packages; [
46
45
boto3
47
46
colorama
48
47
halo
···
52
51
thrift
53
52
];
54
53
55
-
# TestGetMetaData.test_inspect shells out to `parquet-tools` CLI entrypoint
56
-
preCheck = ''
57
-
export PATH=$out/bin:$PATH
58
-
'';
59
-
60
-
nativeCheckInputs = [
61
-
moto
62
-
pytest-mock
63
-
pytestCheckHook
64
-
];
54
+
nativeCheckInputs =
55
+
with python3Packages;
56
+
[
57
+
moto
58
+
pytest-mock
59
+
pytestCheckHook
60
+
]
61
+
++ [
62
+
addBinToPathHook
63
+
];
65
64
66
65
disabledTests = [
67
66
# test file is 2 bytes bigger than expected
+2
-2
pkgs/by-name/pd/pdal/package.nix
+2
-2
pkgs/by-name/pd/pdal/package.nix
···
29
29
30
30
stdenv.mkDerivation (finalAttrs: {
31
31
pname = "pdal";
32
-
version = "2.8.3";
32
+
version = "2.8.4";
33
33
34
34
src = fetchFromGitHub {
35
35
owner = "PDAL";
36
36
repo = "PDAL";
37
37
rev = finalAttrs.version;
38
-
hash = "sha256-i4Kk9T9MwMGshyGtHrSDhnzqeeThRCKXsjpW3rIDVVc=";
38
+
hash = "sha256-52v7oDmvq820mJ91XAZI1rQEwssWcHagcd2QNVV6zPA=";
39
39
};
40
40
41
41
nativeBuildInputs = [
+13
-11
pkgs/by-name/pi/pifpaf/package.nix
+13
-11
pkgs/by-name/pi/pifpaf/package.nix
···
1
1
{
2
2
lib,
3
-
python3,
3
+
python3Packages,
4
4
fetchPypi,
5
+
addBinToPathHook,
5
6
}:
6
7
7
-
python3.pkgs.buildPythonApplication rec {
8
+
python3Packages.buildPythonApplication rec {
8
9
pname = "pifpaf";
9
10
version = "3.2.3";
10
11
format = "setuptools";
···
14
15
hash = "sha256-L039ZAFnYLCU52h1SczJU0T7+1gufxQlVzQr1EPCqc8=";
15
16
};
16
17
17
-
propagatedBuildInputs = with python3.pkgs; [
18
+
propagatedBuildInputs = with python3Packages; [
18
19
click
19
20
daiquiri
20
21
fixtures
···
24
25
xattr
25
26
];
26
27
27
-
preCheck = ''
28
-
export PATH=$out/bin:$PATH
29
-
'';
30
-
31
-
nativeCheckInputs = with python3.pkgs; [
32
-
requests
33
-
testtools
34
-
];
28
+
nativeCheckInputs =
29
+
with python3Packages;
30
+
[
31
+
requests
32
+
testtools
33
+
]
34
+
++ [
35
+
addBinToPathHook
36
+
];
35
37
36
38
pythonImportsCheck = [ "pifpaf" ];
37
39
+14
-12
pkgs/by-name/pr/precice/package.nix
+14
-12
pkgs/by-name/pr/precice/package.nix
···
2
2
lib,
3
3
stdenv,
4
4
fetchFromGitHub,
5
+
fetchpatch,
5
6
cmake,
6
-
gcc,
7
7
boost,
8
8
eigen,
9
9
libxml2,
···
24
24
hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0=";
25
25
};
26
26
27
-
cmakeFlags = [
28
-
"-DPRECICE_PETScMapping=OFF"
29
-
"-DBUILD_SHARED_LIBS=ON"
30
-
"-DPYTHON_LIBRARIES=${python3.libPrefix}"
31
-
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
27
+
patches = lib.optionals (!lib.versionOlder "3.1.2" version) [
28
+
(fetchpatch {
29
+
name = "boost-187-fixes.patch";
30
+
url = "https://github.com/precice/precice/commit/23788e9eeac49a2069e129a0cb1ac846e8cbeb9f.patch";
31
+
hash = "sha256-Z8qOGOkXoCui8Wy0H/OeE+NaTDvyRuPm2A+VJKtjH4s=";
32
+
})
32
33
];
33
34
34
-
env.NIX_CFLAGS_COMPILE = toString (
35
-
lib.optionals stdenv.hostPlatform.isDarwin [ "-D_GNU_SOURCE" ]
36
-
# libxml2-2.12 changed const qualifiers
37
-
++ [ "-fpermissive" ]
38
-
);
35
+
cmakeFlags = [
36
+
(lib.cmakeBool "PRECICE_PETScMapping" false)
37
+
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
38
+
(lib.cmakeFeature "PYTHON_LIBRARIES" python3.libPrefix)
39
+
(lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
40
+
];
39
41
40
42
nativeBuildInputs = [
41
43
cmake
42
-
gcc
43
44
pkg-config
44
45
python3
45
46
python3.pkgs.numpy
46
47
];
48
+
47
49
buildInputs = [
48
50
boost
49
51
eigen
+2
-2
pkgs/by-name/pr/prowler/package.nix
+2
-2
pkgs/by-name/pr/prowler/package.nix
···
6
6
7
7
python3.pkgs.buildPythonApplication rec {
8
8
pname = "prowler";
9
-
version = "5.1.5";
9
+
version = "5.2.3";
10
10
pyproject = true;
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "prowler-cloud";
14
14
repo = "prowler";
15
15
tag = version;
16
-
hash = "sha256-yVoVfJGO+96ck8T63O0ubeTtdhpfziZFHYVXGFNENds=";
16
+
hash = "sha256-gEkD3lMOLpi2NeZBN4V2RJ/aqcuSLSQFSFYFSyDgizc=";
17
17
};
18
18
19
19
pythonRelaxDeps = true;
+3
-3
pkgs/by-name/ra/rainfrog/package.nix
+3
-3
pkgs/by-name/ra/rainfrog/package.nix
···
9
9
rainfrog,
10
10
}:
11
11
let
12
-
version = "0.2.11";
12
+
version = "0.2.13";
13
13
in
14
14
rustPlatform.buildRustPackage {
15
15
inherit version;
···
19
19
owner = "achristmascarl";
20
20
repo = "rainfrog";
21
21
tag = "v${version}";
22
-
hash = "sha256-gtiwkgNyqq+KMATkzaLOjPB6jcjVAM2qq6zwZ1WGkPE=";
22
+
hash = "sha256-CNxaCA7xrAkSCiVao+s5jAp3fheRCYK+/3Yekr1xUKk=";
23
23
};
24
24
25
25
useFetchCargoVendor = true;
26
-
cargoHash = "sha256-7LhCNlbO9MTz2SxxQozdyvxG1uBum9oXaUjXXFS0USs=";
26
+
cargoHash = "sha256-Tl4T5EJGzrPal6ufgbtBwe6wfqI7SC5KbPZslCHe0Qs=";
27
27
28
28
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
29
29
with darwin.apple_sdk.frameworks;
+3
-3
pkgs/by-name/sa/sad/package.nix
+3
-3
pkgs/by-name/sa/sad/package.nix
···
7
7
8
8
rustPlatform.buildRustPackage rec {
9
9
pname = "sad";
10
-
version = "0.4.31";
10
+
version = "0.4.32";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "ms-jpq";
14
14
repo = "sad";
15
15
tag = "v${version}";
16
-
hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko=";
16
+
hash = "sha256-c5TYIVUrfKrVuyolVe7+EhiM/SOFNahz8X6F8WrKEa0=";
17
17
};
18
18
19
19
useFetchCargoVendor = true;
20
-
cargoHash = "sha256-ea/jimyghG7bqe9iRhYL13RQ4gwp9Ke3IjpSI8dTyr8=";
20
+
cargoHash = "sha256-hS66/bPRUpwmW/wSpZCq4kVKFkIhttsozIr3SCyZqQI=";
21
21
22
22
nativeBuildInputs = [ python3 ];
23
23
+3
-3
pkgs/by-name/sh/shellhub-agent/package.nix
+3
-3
pkgs/by-name/sh/shellhub-agent/package.nix
···
12
12
13
13
buildGoModule rec {
14
14
pname = "shellhub-agent";
15
-
version = "0.17.2";
15
+
version = "0.18.0";
16
16
17
17
src = fetchFromGitHub {
18
18
owner = "shellhub-io";
19
19
repo = "shellhub";
20
20
rev = "v${version}";
21
-
hash = "sha256-zMAAimFrOMcBVKuFwl/UpJLEWJHrjH7DNno5KCEvGrM=";
21
+
hash = "sha256-BIcdloW0ab/hNvgUtjL7Xdz2MNFqKmi+umcUjM5gTR8=";
22
22
};
23
23
24
24
modRoot = "./agent";
25
25
26
-
vendorHash = "sha256-jQNWuOwaAx//wDUVOrMc+ETWWbTCTp/SLwL2guERJB8=";
26
+
vendorHash = "sha256-L+oww1HlPWgAYK16OG5bWiDb/OW7uarY8LZyw9b85ac=";
27
27
28
28
ldflags = [
29
29
"-s"
+2
-2
pkgs/by-name/sq/sqlite_orm/package.nix
+2
-2
pkgs/by-name/sq/sqlite_orm/package.nix
···
7
7
}:
8
8
stdenv.mkDerivation (finalAttrs: {
9
9
pname = "sqlite_orm";
10
-
version = "1.9";
10
+
version = "1.9.1";
11
11
12
12
src = fetchFromGitHub {
13
13
owner = "fnc12";
14
14
repo = "sqlite_orm";
15
15
rev = "v${finalAttrs.version}";
16
-
hash = "sha256-jgRCYOtCyXj2E5J3iYBffX2AyBwvhune+i4Pb2eCBrA=";
16
+
hash = "sha256-tlmUYHH0V4qsKSTdrg/OrS9eOEseIDAIU/HN8YK36go=";
17
17
};
18
18
19
19
nativeBuildInputs = [
+1
-1
pkgs/by-name/ta/taskserver/package.nix
+1
-1
pkgs/by-name/ta/taskserver/package.nix
···
49
49
passthru.tests = { inherit (nixosTests) taskserver; };
50
50
51
51
meta = {
52
-
description = "Server for synchronising Taskwarrior clients";
52
+
description = "Server for synchronising Taskwarrior 2 clients";
53
53
homepage = "https://taskwarrior.org";
54
54
license = lib.licenses.mit;
55
55
platforms = lib.platforms.linux;
+6
-3
pkgs/by-name/tr/traefik/package.nix
+6
-3
pkgs/by-name/tr/traefik/package.nix
···
7
7
8
8
buildGo123Module rec {
9
9
pname = "traefik";
10
-
version = "3.3.2";
10
+
version = "3.3.3";
11
11
12
12
# Archive with static assets for webui
13
13
src = fetchzip {
14
14
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
15
-
hash = "sha256-7qS+rOBYDyYI8t0rVNmM0sJjGSdtIVelaIJuW1jaL+g=";
15
+
hash = "sha256-R9fiCLqzrd9SS6LoQt3jOoEchRnPuhmJqIob8JhzqEU=";
16
16
stripRoot = false;
17
17
};
18
18
···
44
44
description = "Modern reverse proxy";
45
45
changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md";
46
46
license = licenses.mit;
47
-
maintainers = with maintainers; [ vdemeester ];
47
+
maintainers = with maintainers; [
48
+
djds
49
+
vdemeester
50
+
];
48
51
mainProgram = "traefik";
49
52
};
50
53
}
+12
-8
pkgs/by-name/tt/tts/package.nix
+12
-8
pkgs/by-name/tt/tts/package.nix
···
4
4
fetchFromGitHub,
5
5
espeak-ng,
6
6
tts,
7
+
addBinToPathHook,
8
+
writableTmpDirAsHomeHook,
7
9
}:
8
10
9
11
let
···
111
113
doCheck = true;
112
114
});
113
115
114
-
nativeCheckInputs = with python.pkgs; [
115
-
espeak-ng
116
-
pytestCheckHook
117
-
];
116
+
nativeCheckInputs =
117
+
with python.pkgs;
118
+
[
119
+
espeak-ng
120
+
pytestCheckHook
121
+
]
122
+
++ [
123
+
addBinToPathHook
124
+
writableTmpDirAsHomeHook
125
+
];
118
126
119
127
preCheck = ''
120
128
# use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules.
121
129
mv TTS{,.old}
122
-
export PATH=$out/bin:$PATH
123
-
124
-
# numba tries to write to HOME directory
125
-
export HOME=$TMPDIR
126
130
127
131
for file in $(grep -rl 'python TTS/bin' tests); do
128
132
substituteInPlace "$file" \
+3
-3
pkgs/by-name/uv/uv/package.nix
+3
-3
pkgs/by-name/uv/uv/package.nix
···
17
17
18
18
rustPlatform.buildRustPackage rec {
19
19
pname = "uv";
20
-
version = "0.5.26";
20
+
version = "0.5.27";
21
21
22
22
src = fetchFromGitHub {
23
23
owner = "astral-sh";
24
24
repo = "uv";
25
25
tag = version;
26
-
hash = "sha256-Rp6DexvMbUdE7i8hik4MC2sW/VFmpxJFfF7ukc49VlE=";
26
+
hash = "sha256-UqwXLAo99ZtvNNIfd5eO+IfdL2fksf0LTrRU2G1/j/8=";
27
27
};
28
28
29
29
useFetchCargoVendor = true;
30
-
cargoHash = "sha256-MZKrkxy7bXQ3lTrPwCRT8nAR8fP+SeZmBEMQrXlvkYo=";
30
+
cargoHash = "sha256-TS823jBGtHNUZzeRJpir6G8F8Cgq7fuxw6pPk8RrE3o=";
31
31
32
32
nativeBuildInputs = [
33
33
cmake
+2
-2
pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+2
-2
pkgs/by-name/v2/v2ray-domain-list-community/package.nix
···
9
9
let
10
10
generator = pkgsBuildBuild.buildGoModule rec {
11
11
pname = "v2ray-domain-list-community";
12
-
version = "20241221105938";
12
+
version = "20250124154827";
13
13
src = fetchFromGitHub {
14
14
owner = "v2fly";
15
15
repo = "domain-list-community";
16
16
rev = version;
17
-
hash = "sha256-k42qnHQY9bfSjyGGtaqKdIxlvU/C7TiN8sD0AiRQmVU=";
17
+
hash = "sha256-E69X6ktgZvW3xrZl+jmQMoPwRQlqU+0RW2epJHyFgeQ=";
18
18
};
19
19
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
20
20
meta = with lib; {
+7
-5
pkgs/by-name/vr/vrcx/package.nix
+7
-5
pkgs/by-name/vr/vrcx/package.nix
···
6
6
}:
7
7
let
8
8
pname = "vrcx";
9
-
version = "2025-01-27T00.10-0ee8137";
9
+
version = "2025.01.31";
10
+
filename = builtins.replaceStrings [ "." ] [ "" ] version;
10
11
src = fetchurl {
11
-
url = "https://github.com/Natsumi-sama/VRCX/releases/download/${version}/VRCX_${version}.AppImage";
12
-
hash = "sha256-kaQOME3jBLr7QJjc7rubNqFu3z+LmiP+UHe2EWYC7ek=";
12
+
hash = "sha256-hrAsy/yv8GW0mIDA5PJLUs4EYNufPiOplLlmb9pFwX4=";
13
+
url = "https://github.com/vrcx-team/VRCX/releases/download/v${version}/VRCX_${filename}.AppImage";
13
14
};
14
15
appimageContents = appimageTools.extract {
15
16
inherit pname src version;
···
19
20
inherit pname version src;
20
21
extraPkgs = pkgs: [ dotnet-runtime ];
21
22
extraInstallCommands = ''
22
-
install -m 444 -D ${appimageContents}/vrcx.desktop $out/share/applications/vrcx.desktop
23
+
install -m 444 -D ${appimageContents}/vrcx.desktop \
24
+
$out/share/applications/vrcx.desktop
23
25
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/256x256/apps/vrcx.png \
24
26
$out/share/icons/hicolor/256x256/apps/vrcx.png
27
+
25
28
substituteInPlace $out/share/applications/vrcx.desktop \
26
29
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
27
-
# Fix icon path
28
30
substituteInPlace $out/share/applications/vrcx.desktop \
29
31
--replace-fail 'Icon=VRCX' "Icon=$out/share/icons/hicolor/256x256/apps/vrcx.png"
30
32
'';
+3
-3
pkgs/by-name/wa/waytrogen/package.nix
+3
-3
pkgs/by-name/wa/waytrogen/package.nix
···
10
10
11
11
rustPlatform.buildRustPackage rec {
12
12
pname = "waytrogen";
13
-
version = "0.6.3";
13
+
version = "0.6.7";
14
14
15
15
src = fetchFromGitHub {
16
16
owner = "nikolaizombie1";
17
17
repo = "waytrogen";
18
18
tag = version;
19
-
hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I=";
19
+
hash = "sha256-JlqRlB/iMeFp229bF4u7M+Z9m9zlizHgqbfmszNwd9k=";
20
20
};
21
21
22
22
useFetchCargoVendor = true;
23
-
cargoHash = "sha256-iCcYlBqXo76QLuzdd1/YbLL99eCOnniHDAOllX8XyXQ=";
23
+
cargoHash = "sha256-S4DPvQ2unFt13eLFS91z7TyfFz7uwMMIgsEQ/JPe0e8=";
24
24
25
25
nativeBuildInputs = [
26
26
pkg-config
+10
-8
pkgs/by-name/xo/xonsh/unwrapped.nix
+10
-8
pkgs/by-name/xo/xonsh/unwrapped.nix
···
2
2
lib,
3
3
coreutils,
4
4
fetchFromGitHub,
5
-
git,
5
+
gitMinimal,
6
6
glibcLocales,
7
7
nix-update-script,
8
8
pythonPackages,
9
+
addBinToPathHook,
10
+
writableTmpDirAsHomeHook,
9
11
}:
10
12
11
13
let
···
19
21
src = fetchFromGitHub {
20
22
owner = "xonsh";
21
23
repo = "xonsh";
22
-
rev = "refs/tags/${argset.version}";
24
+
tag = argset.version;
23
25
hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs=";
24
26
};
25
27
···
39
41
40
42
nativeCheckInputs =
41
43
[
42
-
git
44
+
addBinToPathHook
45
+
gitMinimal
43
46
glibcLocales
47
+
writableTmpDirAsHomeHook
44
48
]
45
49
++ (with pythonPackages; [
46
50
pip
···
77
81
78
82
# https://github.com/xonsh/xonsh/issues/5569
79
83
"test_spec_decorator_alias_output_format"
84
+
85
+
# Broken test
86
+
"test_repath_backslash"
80
87
];
81
88
82
89
disabledTestPaths = [
···
101
108
sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script
102
109
done
103
110
patchShebangs .
104
-
'';
105
-
106
-
preCheck = ''
107
-
export HOME=$TMPDIR
108
-
export PATH=$out/bin:$PATH
109
111
'';
110
112
111
113
passthru = {
+15
-12
pkgs/by-name/zx/zxpy/package.nix
+15
-12
pkgs/by-name/zx/zxpy/package.nix
···
1
1
{
2
2
lib,
3
-
python3,
3
+
python3Packages,
4
4
fetchFromGitHub,
5
5
deterministic-uname,
6
+
addBinToPathHook,
6
7
}:
7
-
python3.pkgs.buildPythonApplication rec {
8
+
9
+
python3Packages.buildPythonApplication rec {
8
10
pname = "zxpy";
9
11
version = "1.6.4";
10
12
pyproject = true;
···
16
18
hash = "sha256-/VITHN517lPUmhLYgJHBYYvvlJdGg2Hhnwk47Mp9uc0=";
17
19
};
18
20
19
-
build-system = [
20
-
python3.pkgs.setuptools
21
+
build-system = with python3Packages; [
22
+
setuptools
21
23
];
22
24
23
-
nativeCheckInputs = [
24
-
deterministic-uname
25
-
python3.pkgs.pytestCheckHook
26
-
];
27
-
28
-
preCheck = ''
29
-
export PATH=$out/bin:$PATH
30
-
'';
25
+
nativeCheckInputs =
26
+
with python3Packages;
27
+
[
28
+
deterministic-uname
29
+
pytestCheckHook
30
+
]
31
+
++ [
32
+
addBinToPathHook
33
+
];
31
34
32
35
pythonImportsCheck = [ "zx" ];
33
36
+2
-2
pkgs/development/libraries/mpich/default.nix
+2
-2
pkgs/development/libraries/mpich/default.nix
···
33
33
34
34
stdenv.mkDerivation rec {
35
35
pname = "mpich";
36
-
version = "4.2.3";
36
+
version = "4.3.0";
37
37
38
38
src = fetchurl {
39
39
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
40
-
hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg=";
40
+
hash = "sha256-XgQTKYStg8q5zFP3YHLSte9abSSwqf+QR6j/lhIbzGM=";
41
41
};
42
42
43
43
patches = [
+22
-2
pkgs/development/python-modules/cffi/default.nix
+22
-2
pkgs/development/python-modules/cffi/default.nix
···
11
11
pycparser,
12
12
}:
13
13
14
+
let
15
+
version = "1.17.1";
16
+
in
14
17
if isPyPy then
15
-
null
18
+
buildPythonPackage {
19
+
pname = "cffi";
20
+
inherit version;
21
+
pyproject = false;
22
+
23
+
# cffi is bundled with PyPy.
24
+
dontUnpack = true;
25
+
26
+
# Some dependent packages expect to have pycparser available when using cffi.
27
+
dependencies = [ pycparser ];
28
+
29
+
meta = {
30
+
description = "Foreign Function Interface for Python calling C code (bundled with PyPy, placeholder package)";
31
+
homepage = "https://cffi.readthedocs.org/";
32
+
license = lib.licenses.mit;
33
+
maintainers = lib.teams.python.members;
34
+
};
35
+
}
16
36
else
17
37
buildPythonPackage rec {
18
38
pname = "cffi";
19
-
version = "1.17.1";
39
+
inherit version;
20
40
pyproject = true;
21
41
22
42
src = fetchPypi {
+2
-5
pkgs/development/python-modules/eliot/default.nix
+2
-5
pkgs/development/python-modules/eliot/default.nix
···
14
14
zope-interface,
15
15
16
16
daemontools,
17
+
addBinToPathHook,
17
18
dask,
18
19
distributed,
19
20
hypothesis,
···
47
48
];
48
49
49
50
nativeCheckInputs = [
51
+
addBinToPathHook
50
52
dask
51
53
distributed
52
54
hypothesis
···
59
61
__darwinAllowLocalNetworking = true;
60
62
61
63
pythonImportsCheck = [ "eliot" ];
62
-
63
-
# Tests run eliot-prettyprint in out/bin.
64
-
preCheck = ''
65
-
export PATH=$out/bin:$PATH
66
-
'';
67
64
68
65
disabledTests = [
69
66
# Fails since dask's bump to 2024.12.2
+2
pkgs/development/python-modules/mistral-common/default.nix
+2
pkgs/development/python-modules/mistral-common/default.nix
+26
-14
pkgs/development/python-modules/pyprecice/default.nix
+26
-14
pkgs/development/python-modules/pyprecice/default.nix
···
1
1
{
2
2
lib,
3
3
buildPythonPackage,
4
-
setuptools,
5
-
pip,
6
-
cython,
7
4
fetchFromGitHub,
5
+
6
+
# build-system
7
+
cython,
8
+
pip,
9
+
pkgconfig,
10
+
setuptools,
11
+
12
+
# dependencies
8
13
mpi4py,
9
14
numpy,
10
15
precice,
11
-
pkgconfig,
12
-
pythonOlder,
13
16
}:
14
17
15
18
buildPythonPackage rec {
16
19
pname = "pyprecice";
17
20
version = "3.1.2";
18
21
pyproject = true;
19
-
20
-
disabled = pythonOlder "3.7";
21
22
22
23
src = fetchFromGitHub {
23
24
owner = "precice";
···
26
27
hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
27
28
};
28
29
29
-
nativeBuildInputs = [
30
-
setuptools
31
-
pip
30
+
postPatch = ''
31
+
substituteInPlace pyproject.toml \
32
+
--replace-fail "setuptools>=61,<72" "setuptools" \
33
+
--replace-fail "numpy<2" "numpy"
34
+
'';
35
+
36
+
build-system = [
32
37
cython
38
+
pip
33
39
pkgconfig
40
+
setuptools
34
41
];
35
42
36
-
propagatedBuildInputs = [
43
+
pythonRelaxDeps = [
44
+
"numpy"
45
+
];
46
+
47
+
dependencies = [
37
48
numpy
38
49
mpi4py
39
50
precice
···
44
55
45
56
# Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
46
57
47
-
meta = with lib; {
58
+
meta = {
48
59
description = "Python language bindings for preCICE";
49
60
homepage = "https://github.com/precice/python-bindings";
50
-
license = licenses.lgpl3Only;
51
-
maintainers = with maintainers; [ Scriptkiddi ];
61
+
changelog = "https://github.com/precice/python-bindings/blob/v${version}/CHANGELOG.md";
62
+
license = lib.licenses.lgpl3Only;
63
+
maintainers = with lib.maintainers; [ Scriptkiddi ];
52
64
};
53
65
}
-24
pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch
-24
pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch
···
1
-
From f6a7748bee79fc2e1898968fef844daacfa7860b Mon Sep 17 00:00:00 2001
2
-
From: SomeoneSerge <else@someonex.net>
3
-
Date: Wed, 31 Jul 2024 12:02:53 +0000
4
-
Subject: [PATCH 1/2] setup.py: don't ask for hipcc --version
5
-
6
-
---
7
-
setup.py | 1 +
8
-
1 file changed, 1 insertion(+)
9
-
10
-
diff --git a/setup.py b/setup.py
11
-
index 72ef26f1..01e006f9 100644
12
-
--- a/setup.py
13
-
+++ b/setup.py
14
-
@@ -279,6 +279,7 @@ def _install_punica() -> bool:
15
-
16
-
17
-
def get_hipcc_rocm_version():
18
-
+ return "0.0" # `hipcc --version` misbehaves ("unresolved paths") inside the nix sandbox
19
-
# Run the hipcc --version command
20
-
result = subprocess.run(['hipcc', '--version'],
21
-
stdout=subprocess.PIPE,
22
-
--
23
-
2.45.1
24
-
+12
pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch
+12
pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch
···
1
+
diff --git a/vllm/model_executor/models/registry.py b/vllm/model_executor/models/registry.py
2
+
index f5a02a5b..e830f987 100644
3
+
--- a/vllm/model_executor/models/registry.py
4
+
+++ b/vllm/model_executor/models/registry.py
5
+
@@ -482,6 +482,7 @@ def _run_in_subprocess(fn: Callable[[], _T]) -> _T:
6
+
returned = subprocess.run(
7
+
[sys.executable, "-m", "vllm.model_executor.models.registry"],
8
+
input=input_bytes,
9
+
+ env={'PYTHONPATH': ':'.join(sys.path)},
10
+
capture_output=True)
11
+
12
+
# check if the subprocess is successful
+18
pkgs/development/python-modules/vllm/0004-drop-lsmod.patch
+18
pkgs/development/python-modules/vllm/0004-drop-lsmod.patch
···
1
+
--- a/setup.py
2
+
+++ b/setup.py
3
+
@@ -340,14 +340,7 @@ def _is_hpu() -> bool:
4
+
out = subprocess.run(["hl-smi"], capture_output=True, check=True)
5
+
is_hpu_available = out.returncode == 0
6
+
except (FileNotFoundError, PermissionError, subprocess.CalledProcessError):
7
+
- if sys.platform.startswith("linux"):
8
+
- try:
9
+
- output = subprocess.check_output(
10
+
- 'lsmod | grep habanalabs | wc -l', shell=True)
11
+
- is_hpu_available = int(output) > 0
12
+
- except (ValueError, FileNotFoundError, PermissionError,
13
+
- subprocess.CalledProcessError):
14
+
- pass
15
+
+ is_hpu_available = False
16
+
return is_hpu_available
17
+
18
+
+248
-42
pkgs/development/python-modules/vllm/default.nix
+248
-42
pkgs/development/python-modules/vllm/default.nix
···
5
5
buildPythonPackage,
6
6
pythonRelaxDepsHook,
7
7
fetchFromGitHub,
8
+
symlinkJoin,
9
+
autoAddDriverRunpath,
10
+
11
+
# build system
12
+
packaging,
13
+
setuptools,
14
+
wheel,
15
+
16
+
# dependencies
8
17
which,
9
18
ninja,
10
19
cmake,
11
-
packaging,
12
-
setuptools,
20
+
setuptools-scm,
13
21
torch,
14
22
outlines,
15
-
wheel,
16
23
psutil,
17
24
ray,
18
25
pandas,
···
21
28
numpy,
22
29
transformers,
23
30
xformers,
31
+
xgrammar,
24
32
fastapi,
25
33
uvicorn,
26
34
pydantic,
27
35
aioprometheus,
36
+
pynvml,
28
37
openai,
29
38
pyzmq,
30
39
tiktoken,
40
+
torchaudio,
31
41
torchvision,
32
42
py-cpuinfo,
33
43
lm-format-enforcer,
34
44
prometheus-fastapi-instrumentator,
35
45
cupy,
36
-
writeShellScript,
46
+
gguf,
47
+
einops,
48
+
importlib-metadata,
49
+
partial-json-parser,
50
+
compressed-tensors,
51
+
mistral-common,
52
+
msgspec,
53
+
numactl,
54
+
tokenizers,
55
+
oneDNN,
56
+
blake3,
57
+
depyf,
58
+
opencv-python-headless,
37
59
38
60
config,
39
61
40
62
cudaSupport ? config.cudaSupport,
41
63
cudaPackages ? { },
42
-
43
-
# Has to be either rocm or cuda, default to the free one
44
-
rocmSupport ? !config.cudaSupport,
64
+
rocmSupport ? config.rocmSupport,
45
65
rocmPackages ? { },
46
66
gpuTargets ? [ ],
47
67
}@args:
48
68
49
69
let
70
+
inherit (lib)
71
+
lists
72
+
strings
73
+
trivial
74
+
;
75
+
76
+
inherit (cudaPackages) cudaFlags;
77
+
78
+
shouldUsePkg =
79
+
pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
80
+
81
+
# see CMakeLists.txt, grepping for GIT_TAG near cutlass
82
+
# https://github.com/vllm-project/vllm/blob/${version}/CMakeLists.txt
50
83
cutlass = fetchFromGitHub {
51
84
owner = "NVIDIA";
52
85
repo = "cutlass";
53
-
rev = "refs/tags/v3.5.0";
54
-
sha256 = "sha256-D/s7eYsa5l/mfx73tE4mnFcTQdYqGmXa9d9TCryw4e4=";
86
+
tag = "v3.7.0";
87
+
hash = "sha256-GUTRXmv3DiM/GN5Bvv2LYovMLKZMlMhoKv4O0g627gs=";
88
+
};
89
+
90
+
vllm-flash-attn = stdenv.mkDerivation rec {
91
+
pname = "vllm-flash-attn";
92
+
version = "2.6.2";
93
+
94
+
# see CMakeLists.txt, grepping for GIT_TAG near vllm-flash-attn
95
+
# https://github.com/vllm-project/vllm/blob/${version}/CMakeLists.txt
96
+
src = fetchFromGitHub {
97
+
owner = "vllm-project";
98
+
repo = "flash-attention";
99
+
rev = "d4e09037abf588af1ec47d0e966b237ee376876c";
100
+
hash = "sha256-KFEsZlrwvCgvPzQ/pCLWcnbGq89mWE3yTDdtJSV9MII=";
101
+
};
102
+
103
+
dontConfigure = true;
104
+
105
+
# vllm-flash-attn normally relies on `git submodule update` to fetch cutlass
106
+
buildPhase = ''
107
+
rm -rf csrc/cutlass
108
+
ln -sf ${cutlass} csrc/cutlass
109
+
'';
110
+
111
+
installPhase = ''
112
+
cp -rva . $out
113
+
'';
55
114
};
115
+
116
+
cpuSupport = !cudaSupport && !rocmSupport;
117
+
118
+
# https://github.com/pytorch/pytorch/blob/v2.4.0/torch/utils/cpp_extension.py#L1953
119
+
supportedTorchCudaCapabilities =
120
+
let
121
+
real = [
122
+
"3.5"
123
+
"3.7"
124
+
"5.0"
125
+
"5.2"
126
+
"5.3"
127
+
"6.0"
128
+
"6.1"
129
+
"6.2"
130
+
"7.0"
131
+
"7.2"
132
+
"7.5"
133
+
"8.0"
134
+
"8.6"
135
+
"8.7"
136
+
"8.9"
137
+
"9.0"
138
+
"9.0a"
139
+
];
140
+
ptx = lists.map (x: "${x}+PTX") real;
141
+
in
142
+
real ++ ptx;
143
+
144
+
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
145
+
# of the first list *from* the second list. That means:
146
+
# lists.subtractLists a b = b - a
147
+
148
+
# For CUDA
149
+
supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities;
150
+
unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities;
151
+
152
+
isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
153
+
154
+
# Use trivial.warnIf to print a warning if any unsupported GPU targets are specified.
155
+
gpuArchWarner =
156
+
supported: unsupported:
157
+
trivial.throwIf (supported == [ ]) (
158
+
"No supported GPU targets specified. Requested GPU targets: "
159
+
+ strings.concatStringsSep ", " unsupported
160
+
) supported;
161
+
162
+
# Create the gpuTargetString.
163
+
gpuTargetString = strings.concatStringsSep ";" (
164
+
if gpuTargets != [ ] then
165
+
# If gpuTargets is specified, it always takes priority.
166
+
gpuTargets
167
+
else if cudaSupport then
168
+
gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities
169
+
else if rocmSupport then
170
+
rocmPackages.clr.gpuTargets
171
+
else
172
+
throw "No GPU targets specified"
173
+
);
174
+
175
+
mergedCudaLibraries = with cudaPackages; [
176
+
cuda_cudart # cuda_runtime.h, -lcudart
177
+
cuda_cccl
178
+
libcusparse # cusparse.h
179
+
libcusolver # cusolverDn.h
180
+
cuda_nvtx
181
+
cuda_nvrtc
182
+
libcublas
183
+
];
184
+
185
+
# Some packages are not available on all platforms
186
+
nccl = shouldUsePkg (cudaPackages.nccl or null);
187
+
188
+
getAllOutputs = p: [
189
+
(lib.getBin p)
190
+
(lib.getLib p)
191
+
(lib.getDev p)
192
+
];
193
+
56
194
in
57
195
58
196
buildPythonPackage rec {
59
197
pname = "vllm";
60
-
version = "0.6.2";
198
+
version = "0.7.1";
61
199
pyproject = true;
62
200
63
201
stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
···
65
203
src = fetchFromGitHub {
66
204
owner = "vllm-project";
67
205
repo = pname;
68
-
rev = "refs/tags/v${version}";
69
-
hash = "sha256-zUkqAPPhDRdN9rDQ2biCl1B+trV0xIHXub++v9zsQGo=";
206
+
tag = "v${version}";
207
+
hash = "sha256-CImXKMEv+jHqngvcr8W6fQLiCo1mqmcZ0Ho0bfAgfbg=";
70
208
};
71
209
72
210
patches = [
73
-
./0001-setup.py-don-t-ask-for-hipcc-version.patch
74
211
./0002-setup.py-nix-support-respect-cmakeFlags.patch
212
+
./0003-propagate-pythonpath.patch
213
+
./0004-drop-lsmod.patch
75
214
];
76
215
77
216
# Ignore the python version check because it hard-codes minor versions and
78
217
# lags behind `ray`'s python interpreter support
79
-
postPatch = ''
80
-
substituteInPlace CMakeLists.txt \
81
-
--replace-fail \
82
-
'set(PYTHON_SUPPORTED_VERSIONS' \
83
-
'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
84
-
'';
218
+
postPatch =
219
+
''
220
+
substituteInPlace CMakeLists.txt \
221
+
--replace-fail \
222
+
'set(PYTHON_SUPPORTED_VERSIONS' \
223
+
'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
224
+
225
+
# Relax torch dependency manually because the nonstandard requirements format
226
+
# is not caught by pythonRelaxDeps
227
+
substituteInPlace requirements*.txt pyproject.toml \
228
+
--replace-warn 'torch==2.5.1' 'torch==${lib.getVersion torch}' \
229
+
--replace-warn 'torch == 2.5.1' 'torch == ${lib.getVersion torch}'
230
+
''
231
+
+ lib.optionalString (nccl == null) ''
232
+
# On platforms where NCCL is not supported (e.g. Jetson), substitute Gloo (provided by Torch)
233
+
substituteInPlace vllm/distributed/parallel_state.py \
234
+
--replace-fail '"nccl"' '"gloo"'
235
+
'';
85
236
86
-
nativeBuildInputs = [
87
-
cmake
88
-
ninja
89
-
pythonRelaxDepsHook
90
-
which
91
-
] ++ lib.optionals rocmSupport [ rocmPackages.hipcc ];
237
+
nativeBuildInputs =
238
+
[
239
+
cmake
240
+
ninja
241
+
pythonRelaxDepsHook
242
+
which
243
+
]
244
+
++ lib.optionals rocmSupport [
245
+
rocmPackages.hipcc
246
+
]
247
+
++ lib.optionals cudaSupport [
248
+
cudaPackages.cuda_nvcc
249
+
autoAddDriverRunpath
250
+
]
251
+
++ lib.optionals isCudaJetson [
252
+
cudaPackages.autoAddCudaCompatRunpath
253
+
];
92
254
93
255
build-system = [
94
256
packaging
···
97
259
];
98
260
99
261
buildInputs =
100
-
(lib.optionals cudaSupport (
101
-
with cudaPackages;
102
-
[
103
-
cuda_cudart # cuda_runtime.h, -lcudart
104
-
cuda_cccl
105
-
libcusparse # cusparse.h
106
-
libcusolver # cusolverDn.h
107
-
cuda_nvcc
108
-
cuda_nvtx
109
-
libcublas
110
-
]
111
-
))
262
+
[
263
+
setuptools-scm
264
+
torch
265
+
]
266
+
++ (lib.optionals cpuSupport ([
267
+
numactl
268
+
oneDNN
269
+
]))
270
+
++ (
271
+
lib.optionals cudaSupport mergedCudaLibraries
272
+
++ (with cudaPackages; [
273
+
nccl
274
+
cudnn
275
+
libcufile
276
+
])
277
+
)
112
278
++ (lib.optionals rocmSupport (
113
279
with rocmPackages;
114
280
[
···
123
289
dependencies =
124
290
[
125
291
aioprometheus
292
+
blake3
293
+
depyf
126
294
fastapi
127
295
lm-format-enforcer
128
296
numpy
129
297
openai
298
+
opencv-python-headless
130
299
outlines
131
300
pandas
132
301
prometheus-fastapi-instrumentator
···
138
307
ray
139
308
sentencepiece
140
309
tiktoken
310
+
tokenizers
311
+
msgspec
312
+
gguf
313
+
einops
314
+
importlib-metadata
315
+
partial-json-parser
316
+
compressed-tensors
317
+
mistral-common
141
318
torch
319
+
torchaudio
142
320
torchvision
143
321
transformers
144
322
uvicorn
145
323
xformers
324
+
xgrammar
146
325
]
147
326
++ uvicorn.optional-dependencies.standard
148
327
++ aioprometheus.optional-dependencies.starlette
149
328
++ lib.optionals cudaSupport [
150
329
cupy
330
+
pynvml
151
331
];
152
332
153
333
dontUseCmakeConfigure = true;
154
-
cmakeFlags = [ (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}") ];
334
+
cmakeFlags =
335
+
[
336
+
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}")
337
+
(lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn}")
338
+
]
339
+
++ lib.optionals cudaSupport [
340
+
(lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}")
341
+
(lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.cudaFlags.cmakeCudaArchitecturesString
342
+
}")
343
+
(lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin {
344
+
name = "cuda-merged-${cudaPackages.cudaVersion}";
345
+
paths = builtins.concatMap getAllOutputs mergedCudaLibraries;
346
+
}}")
347
+
(lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON")
348
+
(lib.cmakeFeature "CAFFE2_USE_CUFILE" "ON")
349
+
(lib.cmakeFeature "CUTLASS_ENABLE_CUBLAS" "ON")
350
+
]
351
+
++ lib.optionals cpuSupport [
352
+
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONEDNN" "${lib.getDev oneDNN}")
353
+
];
155
354
156
355
env =
157
-
lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }
356
+
lib.optionalAttrs cudaSupport {
357
+
VLLM_TARGET_DEVICE = "cuda";
358
+
CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}";
359
+
}
158
360
// lib.optionalAttrs rocmSupport {
361
+
VLLM_TARGET_DEVICE = "rocm";
159
362
# Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing.
160
363
PYTORCH_ROCM_ARCH = lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets;
161
364
ROCM_HOME = "${rocmPackages.clr}";
365
+
}
366
+
// lib.optionalAttrs cpuSupport {
367
+
VLLM_TARGET_DEVICE = "cpu";
162
368
};
163
369
164
370
pythonRelaxDeps = true;
···
177
383
happysalada
178
384
lach
179
385
];
180
-
# RuntimeError: Unknown runtime environment
181
-
broken = true;
182
-
# broken = !cudaSupport && !rocmSupport;
386
+
387
+
# CPU support relies on unpackaged dependency `intel_extension_for_pytorch`
388
+
broken = cpuSupport;
183
389
};
184
390
}
+77
pkgs/development/python-modules/xgrammar/default.nix
+77
pkgs/development/python-modules/xgrammar/default.nix
···
1
+
{
2
+
lib,
3
+
stdenv,
4
+
buildPythonPackage,
5
+
fetchPypi,
6
+
python,
7
+
pythonOlder,
8
+
pythonAtLeast,
9
+
pydantic,
10
+
sentencepiece,
11
+
tiktoken,
12
+
torch,
13
+
transformers,
14
+
triton,
15
+
}:
16
+
17
+
let
18
+
pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
19
+
platforms = rec {
20
+
aarch64-darwin = "macosx_13_0_arm64";
21
+
x86_64-darwin = "macosx_10_15_x86_64";
22
+
x86_64-linux = "manylinux_2_27_x86_64.manylinux_2_28_x86_64";
23
+
};
24
+
platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
25
+
# hashes retrieved via the following command
26
+
# curl https://pypi.org/pypi/xgrammar/${version}/json | jq -r '.urls[] | "\(.digests.sha256) \(.filename)"'
27
+
hashes = rec {
28
+
cp39-aarch64-darwin = "12dd579a7073c14981e01aeee566d20e60001bf90af23024e0e6692a770ff535";
29
+
cp39-x86_64-darwin = "035ec93306543b99bf2141dcc7f1a6dd0c255753fc8b5a2b5f3289a59fed8e37";
30
+
cp39-x86_64-linux = "3b3975dcf4b3ed7b16bbe3c068738b09847f841793e1c5e1b4a07dff36bbdc37";
31
+
cp310-aarch64-darwin = "93bb6c10cbdf1a2bda3b458d97b47436657d780f98dccf3d266e17e13568c0a9";
32
+
cp310-x86_64-darwin = "5ed31db2669dc499d9d29bb16f30b3395332ff9d0fb80b759697190a5ef5258b";
33
+
cp310-x86_64-linux = "9c6f571121e4af45e3b5dc55f3dadd751cffff1f85f1c6fc5c4276db2bbed222";
34
+
cp311-aarch64-darwin = "b293443725eddad31cf7b407bb24d5f3156c4b12a2c8041743cb7068a69fadcb";
35
+
cp311-x86_64-darwin = "b2106bceb2ce313628af915f2c2b1c9865612026dd3c9feddbfcc69e4ee6c971";
36
+
cp311-x86_64-linux = "7934c968371d55759cac35be3b218cdf4b13f323f535ea0faa233240bab803b9";
37
+
cp312-aarch64-darwin = "561f8d4307db8cf5d3c3b3ff46eda6d95379f6e801278dbf9153a9d5e8b6126c";
38
+
cp312-x86_64-darwin = "6ac3cbb0a82a3a9d07f0739f63b2e26cbef7855149d236057dcc7fee74b37970";
39
+
cp312-x86_64-linux = "1854d0fe6b908a3d2d42251a62e627224dbf6035a4322b844b1b5a277e3d0461";
40
+
};
41
+
hash =
42
+
hashes."${pyShortVersion}-${stdenv.system}"
43
+
or (throw "Unsupported Python version: ${python.pythonVersion}");
44
+
in
45
+
buildPythonPackage rec {
46
+
pname = "xgrammar";
47
+
version = "0.1.11";
48
+
format = "wheel";
49
+
50
+
disabled = pythonOlder "3.9" || pythonAtLeast "3.13";
51
+
52
+
src = fetchPypi {
53
+
inherit pname version format;
54
+
dist = pyShortVersion;
55
+
python = pyShortVersion;
56
+
abi = pyShortVersion;
57
+
platform = platform;
58
+
sha256 = hash;
59
+
};
60
+
61
+
pythonImportCheck = [ "xgrammar" ];
62
+
63
+
dependencies = [
64
+
pydantic
65
+
sentencepiece
66
+
tiktoken
67
+
torch
68
+
transformers
69
+
triton
70
+
];
71
+
72
+
meta = with lib; {
73
+
description = "Efficient, Flexible and Portable Structured Generation";
74
+
homepage = "https://xgrammar.mlc.ai";
75
+
license = licenses.asl20;
76
+
};
77
+
}
+3
-2
pkgs/os-specific/linux/tuxedo-drivers/default.nix
+3
-2
pkgs/os-specific/linux/tuxedo-drivers/default.nix
···
10
10
11
11
stdenv.mkDerivation (finalAttrs: {
12
12
pname = "tuxedo-drivers-${kernel.version}";
13
-
version = "4.11.3";
13
+
version = "4.12.1";
14
14
15
15
src = fetchFromGitLab {
16
16
group = "tuxedocomputers";
17
17
owner = "development/packages";
18
18
repo = "tuxedo-drivers";
19
19
rev = "v${finalAttrs.version}";
20
-
hash = "sha256-ylHREVzQY9U/YHmVYQ4qO+A8tUcWXOTspS4g9qn314o=";
20
+
hash = "sha256-ZsfPs8VvvgguyNLSVi6n5hs0OzNwiK3bkooQ267mKtA=";
21
21
};
22
22
23
23
buildInputs = [ pahole ];
···
47
47
blanky0230
48
48
keksgesicht
49
49
xaverdh
50
+
XBagon
50
51
];
51
52
platforms = lib.platforms.linux;
52
53
};
+2
-2
pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
+2
-2
pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
···
18
18
19
19
stdenv.mkDerivation rec {
20
20
pname = "check_ssl_cert";
21
-
version = "2.85.1";
21
+
version = "2.86.0";
22
22
23
23
src = fetchFromGitHub {
24
24
owner = "matteocorti";
25
25
repo = "check_ssl_cert";
26
26
tag = "v${version}";
27
-
hash = "sha256-ix3GyY7xIcrdwzECO6kD7fjccf9OK6Ey+NsSWWcH9ns=";
27
+
hash = "sha256-IXwy6iRjrXVxpZiAYLMVmAgwm7Z8Ck/B0Mwi1UlRcSs=";
28
28
};
29
29
30
30
nativeBuildInputs = [ makeWrapper ];
+2
pkgs/top-level/all-packages.nix
+2
pkgs/top-level/all-packages.nix
+2
pkgs/top-level/python-packages.nix
+2
pkgs/top-level/python-packages.nix
···
18395
18395
inherit (pkgs) xgboost;
18396
18396
};
18397
18397
18398
+
xgrammar = callPackage ../development/python-modules/xgrammar { };
18399
+
18398
18400
xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { };
18399
18401
18400
18402
xiaomi-ble = callPackage ../development/python-modules/xiaomi-ble { };