mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
Compare commits
223 commits
ab98f3a362
...
e59a2e909e
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e59a2e909e | ||
![]() |
aeb2a13428 | ||
![]() |
46d385b56e | ||
![]() |
72d47c8846 | ||
![]() |
9a7f95edaf | ||
![]() |
fe155b8d2c | ||
![]() |
4affcf85e0 | ||
![]() |
0bd398dd36 | ||
![]() |
8070d9c8be | ||
![]() |
d8b19009b6 | ||
![]() |
058cb933c2 | ||
![]() |
5c371589e4 | ||
![]() |
8d9ab52107 | ||
![]() |
3db20bb54e | ||
![]() |
edc7c67ab7 | ||
![]() |
3f134dec90 | ||
![]() |
884b6aefa0 | ||
![]() |
08fcb0dcb5 | ||
![]() |
8820130cdb | ||
![]() |
6a5f6d3c47 | ||
![]() |
951d0963db | ||
![]() |
09540dc1c4 | ||
![]() |
5545f104e3 | ||
![]() |
e23215d5df | ||
![]() |
348f7770e2 | ||
![]() |
a81800ccf6 | ||
![]() |
d4411a8fbf | ||
![]() |
1617f5ee30 | ||
![]() |
49e34896be | ||
![]() |
0398fcb0e6 | ||
![]() |
be357aa712 | ||
![]() |
ae91003958 | ||
![]() |
2238323ca8 | ||
![]() |
33f1d7f5be | ||
![]() |
ef7639f259 | ||
![]() |
2fcdec65a1 | ||
![]() |
70543b7ff7 | ||
![]() |
26e20f3310 | ||
![]() |
bcbfa423e4 | ||
![]() |
8d0e54a6a1 | ||
![]() |
35a22ca9e8 | ||
![]() |
de9c200b20 | ||
![]() |
38eb37f4bf | ||
![]() |
61963cce87 | ||
![]() |
8ca0b2e8e1 | ||
![]() |
efee448735 | ||
![]() |
7cde5cdf66 | ||
![]() |
73c48e3967 | ||
![]() |
30cf874ad2 | ||
![]() |
222f1ed486 | ||
![]() |
ee86e6a1e0 | ||
![]() |
b90256bf91 | ||
![]() |
178baa95a6 | ||
![]() |
448e72ebf2 | ||
![]() |
02322019cc | ||
![]() |
1d251a586a | ||
![]() |
e983f937d7 | ||
![]() |
1a3cfe4e66 | ||
![]() |
7bc1851758 | ||
![]() |
b339a9e138 | ||
![]() |
09977e785b | ||
![]() |
75a0c861f3 | ||
![]() |
dc1703b593 | ||
![]() |
5ba34893bd | ||
![]() |
3aebc02863 | ||
![]() |
edce62fdc8 | ||
![]() |
5fffbaff04 | ||
![]() |
fe22030c71 | ||
![]() |
21e6c1c350 | ||
![]() |
e8fc883a83 | ||
![]() |
78c1102178 | ||
![]() |
302b80e29c | ||
![]() |
6e2b123ae8 | ||
![]() |
c278548eb0 | ||
![]() |
ed63a6e170 | ||
![]() |
b05860bb0c | ||
![]() |
77b64142f1 | ||
![]() |
32e3db8294 | ||
![]() |
a25703f302 | ||
![]() |
4270be4bd6 | ||
![]() |
d88b9dbb7d | ||
![]() |
2e862b306e | ||
![]() |
205813e03d | ||
![]() |
9f861a2574 | ||
![]() |
985630bd23 | ||
![]() |
20d2868dd8 | ||
![]() |
bc36e84714 | ||
![]() |
c8a42d6549 | ||
![]() |
e95fcea8d8 | ||
![]() |
ffa4aab9b2 | ||
![]() |
2b5086de4d | ||
![]() |
a10031aa58 | ||
![]() |
f4c05f860f | ||
![]() |
a20a895d6b | ||
![]() |
6bce2030d8 | ||
![]() |
1e1162daa3 | ||
![]() |
62543ed971 | ||
![]() |
6671b18ab0 | ||
![]() |
40df398c14 | ||
![]() |
0023f57b28 | ||
![]() |
5f226d4da4 | ||
![]() |
28e290a32c | ||
![]() |
8676d1b1a2 | ||
![]() |
6cee80d620 | ||
![]() |
e529dcef56 | ||
![]() |
25423c400c | ||
![]() |
4d9861fc53 | ||
![]() |
c691e8174a | ||
![]() |
06ca2caa63 | ||
![]() |
d8426086f3 | ||
![]() |
a77ca15ec6 | ||
![]() |
a70efe6be0 | ||
![]() |
b612bbedf7 | ||
![]() |
dad88a410e | ||
![]() |
65cd5cc453 | ||
![]() |
a652a057cd | ||
![]() |
38839a0aba | ||
![]() |
36530d5785 | ||
![]() |
4440221965 | ||
![]() |
fba25b5b33 | ||
![]() |
fab1819a09 | ||
![]() |
f07fa971de | ||
![]() |
3ca82e776c | ||
![]() |
c4949d642c | ||
![]() |
89ec07b4b7 | ||
![]() |
e225c35b6d | ||
![]() |
442d5ac1f0 | ||
![]() |
113b5ea334 | ||
![]() |
29aa61192b | ||
![]() |
b33e2df22a | ||
![]() |
12eec2b53d | ||
![]() |
6e84d13d28 | ||
![]() |
5f833b1008 | ||
![]() |
b7f5fce1ca | ||
![]() |
f0b3f7f50a | ||
![]() |
640cb2203b | ||
![]() |
16e86693aa | ||
![]() |
9dc40ca452 | ||
![]() |
a0e04f010d | ||
![]() |
2836a07ca0 | ||
![]() |
e4d692b79d | ||
![]() |
f3072b1ae1 | ||
![]() |
55d5176912 | ||
![]() |
0fb31f2fd3 | ||
![]() |
98bfb9030a | ||
![]() |
3198adc89a | ||
![]() |
625b1ca648 | ||
![]() |
c1a93f9e7a | ||
![]() |
04ee58b617 | ||
![]() |
a621ca0a23 | ||
![]() |
5532e97e51 | ||
![]() |
1a3a6634b0 | ||
![]() |
1fd239539f | ||
![]() |
132b818c73 | ||
![]() |
0ea1016b5f | ||
![]() |
f9a394f234 | ||
![]() |
ccb7677ea6 | ||
![]() |
30cd903824 | ||
![]() |
6fe202161b | ||
![]() |
918ac8cf97 | ||
![]() |
51d12cde6e | ||
![]() |
1468544e38 | ||
![]() |
58d74ee990 | ||
![]() |
b199e4828d | ||
![]() |
b22b3dba4c | ||
![]() |
5d59a9150c | ||
![]() |
efbe0b1ab4 | ||
![]() |
4110183dae | ||
![]() |
e880de1d37 | ||
![]() |
a45ccb08f7 | ||
![]() |
91e28a4ee6 | ||
![]() |
d9707037fa | ||
![]() |
3345f6a5ec | ||
![]() |
82748eb1c2 | ||
![]() |
e7f3d2e213 | ||
![]() |
74cfa2907c | ||
![]() |
23f5c1fc0b | ||
![]() |
a05544193c | ||
![]() |
6e151442ac | ||
![]() |
957a604194 | ||
![]() |
5189f3a24b | ||
![]() |
a07de4c432 | ||
![]() |
be22ec2db8 | ||
![]() |
bf34b9baf4 | ||
![]() |
abb7d30ed1 | ||
![]() |
54e1818d13 | ||
![]() |
04234a7c5d | ||
![]() |
dacc1dab3e | ||
![]() |
c75b5648fb | ||
![]() |
50c07342ba | ||
![]() |
1c3fc325e9 | ||
![]() |
dfe96eaf57 | ||
![]() |
e613166d54 | ||
![]() |
192e86b204 | ||
![]() |
30f3c17616 | ||
![]() |
ff6a188dc5 | ||
![]() |
8866fe7170 | ||
![]() |
dddbb686bc | ||
![]() |
3e454d9aff | ||
![]() |
32ddfbc9e7 | ||
![]() |
02b6183c5a | ||
![]() |
565ec0528a | ||
![]() |
a37ab7eed9 | ||
![]() |
ef049c9111 | ||
![]() |
49eb7acec6 | ||
![]() |
4cd620aa48 | ||
![]() |
769b083935 | ||
![]() |
a4eb33fcb6 | ||
![]() |
93ee7a9232 | ||
![]() |
6cffba31f0 | ||
![]() |
e1b7bd330e | ||
![]() |
7996084a7a | ||
![]() |
0233a69802 | ||
![]() |
cd3f12cbec | ||
![]() |
c2c247d4f4 | ||
![]() |
73aac165ad | ||
![]() |
c9eddce63e | ||
![]() |
35eb287841 | ||
![]() |
da6d32b32c | ||
![]() |
71e6fda65f | ||
![]() |
0235c3f34b | ||
![]() |
be16ca643f | ||
![]() |
23eb34822d |
124 changed files with 1443 additions and 1574 deletions
|
@ -13858,6 +13858,13 @@
|
||||||
githubId = 139;
|
githubId = 139;
|
||||||
name = "Leah Neukirchen";
|
name = "Leah Neukirchen";
|
||||||
};
|
};
|
||||||
|
leana8959 = {
|
||||||
|
name = "Léana Chiang";
|
||||||
|
email = "leana.jiang+git@icloud.com";
|
||||||
|
github = "leana8959";
|
||||||
|
githubId = 87855546;
|
||||||
|
keys = [ { fingerprint = "3659 D5C8 7A4B C5D7 699B 37D8 4E88 7A4C A971 4ADA"; } ];
|
||||||
|
};
|
||||||
lebastr = {
|
lebastr = {
|
||||||
email = "lebastr@gmail.com";
|
email = "lebastr@gmail.com";
|
||||||
github = "lebastr";
|
github = "lebastr";
|
||||||
|
@ -18544,6 +18551,14 @@
|
||||||
githubId = 107261;
|
githubId = 107261;
|
||||||
name = "Andrey Kuznetsov";
|
name = "Andrey Kuznetsov";
|
||||||
};
|
};
|
||||||
|
ontake = {
|
||||||
|
name = "Louis Dalibard";
|
||||||
|
email = "ontake@ontake.dev";
|
||||||
|
github = "make-42";
|
||||||
|
githubId = 17462236;
|
||||||
|
matrix = "@ontake:matrix.ontake.dev";
|
||||||
|
keys = [ { fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; } ];
|
||||||
|
};
|
||||||
onthestairs = {
|
onthestairs = {
|
||||||
email = "austinplatt@gmail.com";
|
email = "austinplatt@gmail.com";
|
||||||
github = "onthestairs";
|
github = "onthestairs";
|
||||||
|
@ -19818,6 +19833,12 @@
|
||||||
githubId = 38314551;
|
githubId = 38314551;
|
||||||
name = "Peter Okelmann";
|
name = "Peter Okelmann";
|
||||||
};
|
};
|
||||||
|
Pokeylooted = {
|
||||||
|
email = "pokeyrandomgaming@gmail.com";
|
||||||
|
github = "Pokeylooted";
|
||||||
|
githubId = 79169880;
|
||||||
|
name = "Dani Barton";
|
||||||
|
};
|
||||||
pokon548 = {
|
pokon548 = {
|
||||||
email = "nix@bukn.uk";
|
email = "nix@bukn.uk";
|
||||||
github = "pokon548";
|
github = "pokon548";
|
||||||
|
|
|
@ -367,19 +367,25 @@ in
|
||||||
# AmbientCapabilities
|
# AmbientCapabilities
|
||||||
AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
|
AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
|
||||||
# Capabilities
|
# Capabilities
|
||||||
CapabilityBoundingSet = [
|
CapabilityBoundingSet =
|
||||||
"CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
|
[
|
||||||
"CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
|
"CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
|
||||||
"CAP_FOWNER" # is required for freeipmi plugin
|
"CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin
|
||||||
"CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
|
"CAP_NET_RAW" # is required for fping app
|
||||||
"CAP_SYS_ADMIN" # is required for perf plugin
|
"CAP_PERFMON" # is required for perf plugin
|
||||||
"CAP_SYS_PTRACE" # is required for apps plugin
|
"CAP_SETPCAP" # is required for apps, perf and slabinfo plugins
|
||||||
"CAP_SYS_RESOURCE" # is required for ebpf plugin
|
"CAP_SETUID" # is required for cgroups and cgroups-network plugins
|
||||||
"CAP_NET_RAW" # is required for fping app
|
"CAP_SYSLOG" # is required for systemd-journal plugin
|
||||||
"CAP_SYS_CHROOT" # is required for cgroups plugin
|
"CAP_SYS_ADMIN" # is required for perf plugin
|
||||||
"CAP_SETUID" # is required for cgroups and cgroups-network plugins
|
"CAP_SYS_CHROOT" # is required for cgroups plugin
|
||||||
"CAP_SYSLOG" # is required for systemd-journal plugin
|
"CAP_SYS_PTRACE" # is required for apps plugin
|
||||||
] ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
|
"CAP_SYS_RESOURCE" # is required for ebpf plugin
|
||||||
|
]
|
||||||
|
++ lib.optionals cfg.package.withIpmi [
|
||||||
|
"CAP_FOWNER"
|
||||||
|
"CAP_SYS_RAWIO"
|
||||||
|
]
|
||||||
|
++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN";
|
||||||
# Sandboxing
|
# Sandboxing
|
||||||
ProtectSystem = "full";
|
ProtectSystem = "full";
|
||||||
ProtectHome = "read-only";
|
ProtectHome = "read-only";
|
||||||
|
@ -464,7 +470,7 @@ in
|
||||||
// lib.optionalAttrs (cfg.package.withIpmi) {
|
// lib.optionalAttrs (cfg.package.withIpmi) {
|
||||||
"freeipmi.plugin" = {
|
"freeipmi.plugin" = {
|
||||||
source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
|
source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
|
||||||
capabilities = "cap_dac_override,cap_fowner+ep";
|
capabilities = "cap_dac_override,cap_fowner,cap_sys_rawio+ep";
|
||||||
owner = cfg.user;
|
owner = cfg.user;
|
||||||
group = cfg.group;
|
group = cfg.group;
|
||||||
permissions = "u+rx,g+x,o-rwx";
|
permissions = "u+rx,g+x,o-rwx";
|
||||||
|
|
|
@ -460,6 +460,17 @@ in
|
||||||
apply = unique;
|
apply = unique;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
overwriteMembers = mkOption {
|
||||||
|
description = ''
|
||||||
|
Whether the member list should be overwritten each time (true) or appended
|
||||||
|
(false). Append mode allows interactive group management in addition to the
|
||||||
|
declared members. Also, future member removals cannot be reflected
|
||||||
|
automatically in append mode.
|
||||||
|
'';
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
config.members = concatLists (
|
config.members = concatLists (
|
||||||
flip mapAttrsToList cfg.provision.persons (
|
flip mapAttrsToList cfg.provision.persons (
|
||||||
|
|
|
@ -92,7 +92,4 @@ in
|
||||||
{
|
{
|
||||||
nixos-container = mkContainersTest;
|
nixos-container = mkContainersTest;
|
||||||
}
|
}
|
||||||
// (lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) { } [
|
// (lib.genAttrs [ "docker" "podman" ] mkOCITest)
|
||||||
"docker"
|
|
||||||
"podman"
|
|
||||||
])
|
|
||||||
|
|
|
@ -73,6 +73,10 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
groups.testgroup1 = { };
|
groups.testgroup1 = { };
|
||||||
|
groups.imperative = {
|
||||||
|
overwriteMembers = false;
|
||||||
|
members = [ "testuser1" ];
|
||||||
|
};
|
||||||
|
|
||||||
persons.testuser1 = {
|
persons.testuser1 = {
|
||||||
displayName = "Test User";
|
displayName = "Test User";
|
||||||
|
@ -133,6 +137,11 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
groups.testgroup1 = { };
|
groups.testgroup1 = { };
|
||||||
|
groups.imperative = {
|
||||||
|
overwriteMembers = false;
|
||||||
|
# Will be retained:
|
||||||
|
# members = [ "testuser1" ];
|
||||||
|
};
|
||||||
|
|
||||||
persons.testuser1 = {
|
persons.testuser1 = {
|
||||||
displayName = "Test User (changed)";
|
displayName = "Test User (changed)";
|
||||||
|
@ -351,6 +360,10 @@ in
|
||||||
out = provision.succeed("kanidm group get testgroup1")
|
out = provision.succeed("kanidm group get testgroup1")
|
||||||
assert_contains(out, "name: testgroup1")
|
assert_contains(out, "name: testgroup1")
|
||||||
|
|
||||||
|
out = provision.succeed("kanidm group get imperative")
|
||||||
|
assert_contains(out, "name: imperative")
|
||||||
|
assert_contains(out, "member: testuser1")
|
||||||
|
|
||||||
out = provision.succeed("kanidm group get supergroup1")
|
out = provision.succeed("kanidm group get supergroup1")
|
||||||
assert_contains(out, "name: supergroup1")
|
assert_contains(out, "name: supergroup1")
|
||||||
assert_contains(out, "member: testgroup1")
|
assert_contains(out, "member: testgroup1")
|
||||||
|
@ -361,6 +374,7 @@ in
|
||||||
assert_contains(out, "legalname: Jane Doe")
|
assert_contains(out, "legalname: Jane Doe")
|
||||||
assert_contains(out, "mail: jane.doe@example.com")
|
assert_contains(out, "mail: jane.doe@example.com")
|
||||||
assert_contains(out, "memberof: testgroup1")
|
assert_contains(out, "memberof: testgroup1")
|
||||||
|
assert_contains(out, "memberof: imperative")
|
||||||
assert_contains(out, "memberof: service1-access")
|
assert_contains(out, "memberof: service1-access")
|
||||||
|
|
||||||
out = provision.succeed("kanidm person get testuser2")
|
out = provision.succeed("kanidm person get testuser2")
|
||||||
|
@ -405,6 +419,10 @@ in
|
||||||
out = provision.succeed("kanidm group get testgroup1")
|
out = provision.succeed("kanidm group get testgroup1")
|
||||||
assert_contains(out, "name: testgroup1")
|
assert_contains(out, "name: testgroup1")
|
||||||
|
|
||||||
|
out = provision.succeed("kanidm group get imperative")
|
||||||
|
assert_contains(out, "name: imperative")
|
||||||
|
assert_contains(out, "member: testuser1")
|
||||||
|
|
||||||
out = provision.succeed("kanidm group get supergroup1")
|
out = provision.succeed("kanidm group get supergroup1")
|
||||||
assert_contains(out, "name: supergroup1")
|
assert_contains(out, "name: supergroup1")
|
||||||
assert_lacks(out, "member: testgroup1")
|
assert_lacks(out, "member: testgroup1")
|
||||||
|
@ -416,6 +434,7 @@ in
|
||||||
assert_contains(out, "mail: jane.doe@example.com")
|
assert_contains(out, "mail: jane.doe@example.com")
|
||||||
assert_contains(out, "mail: second.doe@example.com")
|
assert_contains(out, "mail: second.doe@example.com")
|
||||||
assert_lacks(out, "memberof: testgroup1")
|
assert_lacks(out, "memberof: testgroup1")
|
||||||
|
assert_contains(out, "memberof: imperative")
|
||||||
assert_contains(out, "memberof: service1-access")
|
assert_contains(out, "memberof: service1-access")
|
||||||
|
|
||||||
out = provision.succeed("kanidm person get testuser2")
|
out = provision.succeed("kanidm person get testuser2")
|
||||||
|
|
|
@ -3807,6 +3807,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
debugmaster-nvim = buildVimPlugin {
|
||||||
|
pname = "debugmaster.nvim";
|
||||||
|
version = "2025-05-26";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "miroshQa";
|
||||||
|
repo = "debugmaster.nvim";
|
||||||
|
rev = "aeae4c324be259856a3e9e436db89875421b78ca";
|
||||||
|
sha256 = "1b919qrljmrczi89cn276rx5yib63yhnr3wscbypckda2d62bh5a";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/miroshQa/debugmaster.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
debugprint-nvim = buildVimPlugin {
|
debugprint-nvim = buildVimPlugin {
|
||||||
pname = "debugprint.nvim";
|
pname = "debugprint.nvim";
|
||||||
version = "2025-05-28";
|
version = "2025-05-28";
|
||||||
|
@ -4643,6 +4656,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
endec-nvim = buildVimPlugin {
|
||||||
|
pname = "endec.nvim";
|
||||||
|
version = "2025-04-07";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ovk";
|
||||||
|
repo = "endec.nvim";
|
||||||
|
rev = "3765f250064040725fa637e9a308253e1421b1fd";
|
||||||
|
sha256 = "088fv7yag7phpwxrmcq82mgy1fin6zcsyb6cz853z22hsn4zb7z5";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/ovk/endec.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
errormarker-vim = buildVimPlugin {
|
errormarker-vim = buildVimPlugin {
|
||||||
pname = "errormarker.vim";
|
pname = "errormarker.vim";
|
||||||
version = "2015-01-26";
|
version = "2015-01-26";
|
||||||
|
@ -7290,6 +7316,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
live-share-nvim = buildVimPlugin {
|
||||||
|
pname = "live-share.nvim";
|
||||||
|
version = "2025-05-03";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "azratul";
|
||||||
|
repo = "live-share.nvim";
|
||||||
|
rev = "11edb945131752c534fc903b7af2abfd6cf7edc6";
|
||||||
|
sha256 = "11aiy4ki2gd67zfvf8bn3c0vghwmk8i87ylx3h1v0kvdjbq3bxww";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/azratul/live-share.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
llama-vim = buildVimPlugin {
|
llama-vim = buildVimPlugin {
|
||||||
pname = "llama.vim";
|
pname = "llama.vim";
|
||||||
version = "2025-05-22";
|
version = "2025-05-22";
|
||||||
|
@ -8617,6 +8656,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
multicursor-nvim = buildVimPlugin {
|
||||||
|
pname = "multicursor.nvim";
|
||||||
|
version = "2025-05-29";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jake-stewart";
|
||||||
|
repo = "multicursor.nvim";
|
||||||
|
rev = "6fba38bccf45cfb681f4ff6098f886213f299a34";
|
||||||
|
sha256 = "1d3lsxg9kmn4622nacn2ycg56ca3skazjaar0smc61v1asa8jhrm";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
multicursors-nvim = buildVimPlugin {
|
multicursors-nvim = buildVimPlugin {
|
||||||
pname = "multicursors.nvim";
|
pname = "multicursors.nvim";
|
||||||
version = "2025-02-26";
|
version = "2025-02-26";
|
||||||
|
@ -9712,6 +9764,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ng-nvim = buildVimPlugin {
|
||||||
|
pname = "ng.nvim";
|
||||||
|
version = "2025-04-21";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "joeveiga";
|
||||||
|
repo = "ng.nvim";
|
||||||
|
rev = "28b87c46fe813c8859d607f4a31b7b5fbdbd75d3";
|
||||||
|
sha256 = "0i6y9p2cvbka97qnlwpl0kmfbl7xf98sx0khnjd5nappi7kb9zi8";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/joeveiga/ng.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
nginx-vim = buildVimPlugin {
|
nginx-vim = buildVimPlugin {
|
||||||
pname = "nginx.vim";
|
pname = "nginx.vim";
|
||||||
version = "2023-11-26";
|
version = "2023-11-26";
|
||||||
|
@ -12066,6 +12131,19 @@ final: prev: {
|
||||||
meta.hydraPlatforms = [ ];
|
meta.hydraPlatforms = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patterns-nvim = buildVimPlugin {
|
||||||
|
pname = "patterns.nvim";
|
||||||
|
version = "2025-05-12";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "OXY2DEV";
|
||||||
|
repo = "patterns.nvim";
|
||||||
|
rev = "f45abad8b6e8606279c933017d68dcf1d0dc53d4";
|
||||||
|
sha256 = "1pxkiz759c60fds2cbc089zwk9yqxymzva81dxkm20iprc988cc7";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/OXY2DEV/patterns.nvim/";
|
||||||
|
meta.hydraPlatforms = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
pckr-nvim = buildVimPlugin {
|
pckr-nvim = buildVimPlugin {
|
||||||
pname = "pckr.nvim";
|
pname = "pckr.nvim";
|
||||||
version = "2025-05-09";
|
version = "2025-05-09";
|
||||||
|
|
|
@ -976,6 +976,10 @@ in
|
||||||
dependencies = [ self.denops-vim ];
|
dependencies = [ self.denops-vim ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
debugmaster-nvim = super.debugmaster-nvim.overrideAttrs {
|
||||||
|
dependencies = [ self.nvim-dap ];
|
||||||
|
};
|
||||||
|
|
||||||
defx-nvim = super.defx-nvim.overrideAttrs {
|
defx-nvim = super.defx-nvim.overrideAttrs {
|
||||||
dependencies = [ self.nvim-yarp ];
|
dependencies = [ self.nvim-yarp ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -291,6 +291,7 @@ https://github.com/Shougo/ddc-source-lsp/,HEAD,
|
||||||
https://github.com/Shougo/ddc-ui-native/,HEAD,
|
https://github.com/Shougo/ddc-ui-native/,HEAD,
|
||||||
https://github.com/Shougo/ddc-ui-pum/,HEAD,
|
https://github.com/Shougo/ddc-ui-pum/,HEAD,
|
||||||
https://github.com/Shougo/ddc.vim/,HEAD,
|
https://github.com/Shougo/ddc.vim/,HEAD,
|
||||||
|
https://github.com/miroshQa/debugmaster.nvim/,HEAD,
|
||||||
https://github.com/andrewferrier/debugprint.nvim/,HEAD,
|
https://github.com/andrewferrier/debugprint.nvim/,HEAD,
|
||||||
https://github.com/Verf/deepwhite.nvim/,,
|
https://github.com/Verf/deepwhite.nvim/,,
|
||||||
https://github.com/kristijanhusak/defx-git/,,
|
https://github.com/kristijanhusak/defx-git/,,
|
||||||
|
@ -355,6 +356,7 @@ https://github.com/dmix/elvish.vim/,,
|
||||||
https://github.com/embark-theme/vim/,,embark-vim
|
https://github.com/embark-theme/vim/,,embark-vim
|
||||||
https://github.com/mattn/emmet-vim/,,
|
https://github.com/mattn/emmet-vim/,,
|
||||||
https://github.com/vim-scripts/emodeline/,,
|
https://github.com/vim-scripts/emodeline/,,
|
||||||
|
https://github.com/ovk/endec.nvim/,HEAD,
|
||||||
https://github.com/vim-scripts/errormarker.vim/,,
|
https://github.com/vim-scripts/errormarker.vim/,,
|
||||||
https://github.com/hachy/eva01.vim/,,
|
https://github.com/hachy/eva01.vim/,,
|
||||||
https://github.com/sainnhe/everforest/,,
|
https://github.com/sainnhe/everforest/,,
|
||||||
|
@ -559,6 +561,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,,
|
||||||
https://github.com/ldelossa/litee-symboltree.nvim/,,
|
https://github.com/ldelossa/litee-symboltree.nvim/,,
|
||||||
https://github.com/ldelossa/litee.nvim/,,
|
https://github.com/ldelossa/litee.nvim/,,
|
||||||
https://github.com/smjonas/live-command.nvim/,HEAD,
|
https://github.com/smjonas/live-command.nvim/,HEAD,
|
||||||
|
https://github.com/azratul/live-share.nvim/,HEAD,
|
||||||
https://github.com/ggml-org/llama.vim/,HEAD,
|
https://github.com/ggml-org/llama.vim/,HEAD,
|
||||||
https://github.com/huggingface/llm.nvim/,HEAD,
|
https://github.com/huggingface/llm.nvim/,HEAD,
|
||||||
https://github.com/folke/lsp-colors.nvim/,,
|
https://github.com/folke/lsp-colors.nvim/,,
|
||||||
|
@ -661,6 +664,7 @@ https://github.com/jackplus-xyz/monaspace.nvim/,HEAD,
|
||||||
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
|
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
|
||||||
https://github.com/leafo/moonscript-vim/,HEAD,
|
https://github.com/leafo/moonscript-vim/,HEAD,
|
||||||
https://github.com/yegappan/mru/,,
|
https://github.com/yegappan/mru/,,
|
||||||
|
https://github.com/jake-stewart/multicursor.nvim/,HEAD,
|
||||||
https://github.com/smoka7/multicursors.nvim/,HEAD,
|
https://github.com/smoka7/multicursors.nvim/,HEAD,
|
||||||
https://github.com/AckslD/muren.nvim/,HEAD,
|
https://github.com/AckslD/muren.nvim/,HEAD,
|
||||||
https://github.com/jbyuki/nabla.nvim/,HEAD,
|
https://github.com/jbyuki/nabla.nvim/,HEAD,
|
||||||
|
@ -745,6 +749,7 @@ https://github.com/prichrd/netrw.nvim/,HEAD,
|
||||||
https://github.com/oberblastmeister/neuron.nvim/,,
|
https://github.com/oberblastmeister/neuron.nvim/,,
|
||||||
https://github.com/fiatjaf/neuron.vim/,,
|
https://github.com/fiatjaf/neuron.vim/,,
|
||||||
https://github.com/Olical/nfnl/,main,
|
https://github.com/Olical/nfnl/,main,
|
||||||
|
https://github.com/joeveiga/ng.nvim/,HEAD,
|
||||||
https://github.com/chr4/nginx.vim/,,
|
https://github.com/chr4/nginx.vim/,,
|
||||||
https://github.com/oxfist/night-owl.nvim/,,
|
https://github.com/oxfist/night-owl.nvim/,,
|
||||||
https://github.com/bluz71/vim-nightfly-colors/,,nightfly
|
https://github.com/bluz71/vim-nightfly-colors/,,nightfly
|
||||||
|
@ -926,6 +931,7 @@ https://github.com/NLKNguyen/papercolor-theme/,,
|
||||||
https://github.com/pappasam/papercolor-theme-slim/,HEAD,
|
https://github.com/pappasam/papercolor-theme-slim/,HEAD,
|
||||||
https://github.com/dundalek/parpar.nvim/,,
|
https://github.com/dundalek/parpar.nvim/,,
|
||||||
https://github.com/frankroeder/parrot.nvim/,HEAD,
|
https://github.com/frankroeder/parrot.nvim/,HEAD,
|
||||||
|
https://github.com/OXY2DEV/patterns.nvim/,HEAD,
|
||||||
https://github.com/lewis6991/pckr.nvim/,HEAD,
|
https://github.com/lewis6991/pckr.nvim/,HEAD,
|
||||||
https://github.com/tmsvg/pear-tree/,,
|
https://github.com/tmsvg/pear-tree/,,
|
||||||
https://github.com/steelsojka/pears.nvim/,,
|
https://github.com/steelsojka/pears.nvim/,,
|
||||||
|
|
|
@ -3538,6 +3538,8 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ms-vscode.remote-explorer = callPackage ./ms-vscode.remote-explorer { };
|
||||||
|
|
||||||
ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension {
|
ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "test-adapter-converter";
|
name = "test-adapter-converter";
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
vscode-utils,
|
||||||
|
}:
|
||||||
|
|
||||||
|
vscode-utils.buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
name = "remote-explorer";
|
||||||
|
publisher = "ms-vscode";
|
||||||
|
version = "0.5.0";
|
||||||
|
sha256 = "sha256-BNsnetpddxv3Y9MjZERU5jOq1I2g6BNFF1rD7Agpmr8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Visual Studio Code extension to view remote machines for SSH and Tunnels";
|
||||||
|
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.remote-explorer";
|
||||||
|
homepage = "https://github.com/Microsoft/vscode-remote-release";
|
||||||
|
license = lib.licenses.unfree;
|
||||||
|
};
|
||||||
|
}
|
|
@ -36,22 +36,22 @@ let
|
||||||
|
|
||||||
sha256 =
|
sha256 =
|
||||||
{
|
{
|
||||||
x86_64-linux = "1h55vjyv6vy4vyzi6lypnh4jrng8dgb7i6l9rq6k94lbl3mbnb2w";
|
x86_64-linux = "0kd4nb8b17j7ii5lhq4cih62pghb4j9gylgz9yqippxivzzkq6dd";
|
||||||
x86_64-darwin = "02c79ii2gpffc552aq0slpxfdp4ajf1cp7djhn7bap22wym53x8v";
|
x86_64-darwin = "1y96sp3lkm32fnhjak2js11m9qf8155gglp9g83ynv9d8sdy14ya";
|
||||||
aarch64-linux = "1ixx31ar2hb25387520509p8lqi9a5if7c992hizvjwdvwfsvwx5";
|
aarch64-linux = "162wac7s0l4pq6r6sh32lh69j90rna430z57ksb6g9w8spqzqnv4";
|
||||||
aarch64-darwin = "1ic6z47ci0wqq7sak0x9x0ywa0m7mgls2fm6m9fvd4xh1asa25ms";
|
aarch64-darwin = "1rqq131f1hs2z14ddh7sp6flwsgb58r8nw1ydbcclcmzi3vbdgr9";
|
||||||
armv7l-linux = "1xn1nl7s88jsxwavm3m9w35518qn4886mqh6zfiwzj5dn3ib8425";
|
armv7l-linux = "06czqpzwlrx98bv2vmawjxxmzw9z6bcfxikp7nxhi8qp8nsjfvgy";
|
||||||
}
|
}
|
||||||
.${system} or throwSystem;
|
.${system} or throwSystem;
|
||||||
in
|
in
|
||||||
callPackage ./generic.nix rec {
|
callPackage ./generic.nix rec {
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.100.2";
|
version = "1.100.3";
|
||||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||||
|
|
||||||
# This is used for VS Code - Remote SSH test
|
# This is used for VS Code - Remote SSH test
|
||||||
rev = "848b80aeb52026648a8ff9f7c45a9b0a80641e2e";
|
rev = "258e40fedc6cb8edf399a463ce3a9d32e7e1f6f3";
|
||||||
|
|
||||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||||
|
@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "vscode-server-${rev}.tar.gz";
|
name = "vscode-server-${rev}.tar.gz";
|
||||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||||
sha256 = "0d5hbhk4f551yxrq28xyg3yj5xh72d9c1kd1cc9r9fq94l93pdvm";
|
sha256 = "0bd04p4i5hkkccglw5x3vxf4vbq9hj83gdwfnaps5yskcqizhw77";
|
||||||
};
|
};
|
||||||
stdenv = stdenvNoCC;
|
stdenv = stdenvNoCC;
|
||||||
};
|
};
|
||||||
|
|
|
@ -326,13 +326,13 @@
|
||||||
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
|
||||||
},
|
},
|
||||||
"datadog": {
|
"datadog": {
|
||||||
"hash": "sha256-+C+pvw3ghriw3mR/lvpsSH0inTMPNwc6QAEtt6nXINw=",
|
"hash": "sha256-6X8gdM0xrkquO9BgxqygzfKUGKXE8Vum9+oqLzOihY4=",
|
||||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||||
"owner": "DataDog",
|
"owner": "DataDog",
|
||||||
"repo": "terraform-provider-datadog",
|
"repo": "terraform-provider-datadog",
|
||||||
"rev": "v3.63.0",
|
"rev": "v3.65.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-FmNeAwJ/lZZEIGt5QlYm9Cqu2cgkXVa1B/ej+5/G7wg="
|
"vendorHash": "sha256-fXqX8Uhqq93/ZIGOKtP5hRlGHyXF8EuIBOoAv752pmg="
|
||||||
},
|
},
|
||||||
"deno": {
|
"deno": {
|
||||||
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
"hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",
|
||||||
|
@ -525,11 +525,11 @@
|
||||||
"vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM="
|
"vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM="
|
||||||
},
|
},
|
||||||
"google-beta": {
|
"google-beta": {
|
||||||
"hash": "sha256-VpfIfzIG1h5qnvEqogCK359LLLSgdgxg0DtRGvdZtLU=",
|
"hash": "sha256-9VjgTc0vCXxPEbuycMbxWdbwnhz/4Clff3GcMZ+zKoc=",
|
||||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"repo": "terraform-provider-google-beta",
|
"repo": "terraform-provider-google-beta",
|
||||||
"rev": "v6.37.0",
|
"rev": "v6.38.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-oz4zVv5swFokYCdcJhBE+PLrIOjwszl58Cn0e7hOKmI="
|
"vendorHash": "sha256-oz4zVv5swFokYCdcJhBE+PLrIOjwszl58Cn0e7hOKmI="
|
||||||
},
|
},
|
||||||
|
@ -1120,20 +1120,20 @@
|
||||||
"vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw="
|
"vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw="
|
||||||
},
|
},
|
||||||
"routeros": {
|
"routeros": {
|
||||||
"hash": "sha256-vL1ijiP+WDe8nqtSudOuOTPohHe8JRU6wF4el5P/pWg=",
|
"hash": "sha256-ciQsBvpX6gWnDPt9O1SGrVVgNCvAHBPCaLfVlPxrSAY=",
|
||||||
"homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
|
"homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
|
||||||
"owner": "terraform-routeros",
|
"owner": "terraform-routeros",
|
||||||
"repo": "terraform-provider-routeros",
|
"repo": "terraform-provider-routeros",
|
||||||
"rev": "v1.85.1",
|
"rev": "v1.85.3",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-ysmNy+xojcHPSs++HofOxBKg1AlUO7taYVIcsmW/2kM="
|
"vendorHash": "sha256-lurBPksF2+SPraQ6KRr4EmI8rR7lY9BN+LZY8pKHjYU="
|
||||||
},
|
},
|
||||||
"rundeck": {
|
"rundeck": {
|
||||||
"hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=",
|
"hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
|
||||||
"homepage": "https://registry.terraform.io/providers/rundeck/rundeck",
|
"homepage": "https://registry.terraform.io/providers/rundeck/rundeck",
|
||||||
"owner": "rundeck",
|
"owner": "rundeck",
|
||||||
"repo": "terraform-provider-rundeck",
|
"repo": "terraform-provider-rundeck",
|
||||||
"rev": "v0.5.1",
|
"rev": "v0.5.2",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": null
|
"vendorHash": null
|
||||||
},
|
},
|
||||||
|
@ -1192,13 +1192,13 @@
|
||||||
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
|
||||||
},
|
},
|
||||||
"signalfx": {
|
"signalfx": {
|
||||||
"hash": "sha256-rzYy/tDLfbgzbKSPJWTzSFcamLh0HyF50nbtUJYokL4=",
|
"hash": "sha256-VDBnZMvXEDjyDCC0fbm+kppglY9W83re6ABBsX6Ur+M=",
|
||||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||||
"owner": "splunk-terraform",
|
"owner": "splunk-terraform",
|
||||||
"repo": "terraform-provider-signalfx",
|
"repo": "terraform-provider-signalfx",
|
||||||
"rev": "v9.13.2",
|
"rev": "v9.15.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-/Lu1J/ZT5eq07quvqcm2N1dZPaWF23C5L5CVaUX7HaE="
|
"vendorHash": "sha256-2q3IMGzGm7CVuzs+jfU2oUD+NGwck+ny8GwcMnKfU9U="
|
||||||
},
|
},
|
||||||
"skytap": {
|
"skytap": {
|
||||||
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
|
"hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=",
|
||||||
|
@ -1427,11 +1427,11 @@
|
||||||
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
|
"vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4="
|
||||||
},
|
},
|
||||||
"venafi": {
|
"venafi": {
|
||||||
"hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=",
|
"hash": "sha256-9/rFRZz5KqfUnX3/Dp8CVfGOtlEVu6HuYsUT2WVAPg0=",
|
||||||
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
|
"homepage": "https://registry.terraform.io/providers/Venafi/venafi",
|
||||||
"owner": "Venafi",
|
"owner": "Venafi",
|
||||||
"repo": "terraform-provider-venafi",
|
"repo": "terraform-provider-venafi",
|
||||||
"rev": "v0.22.0",
|
"rev": "v0.22.1",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA="
|
"vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA="
|
||||||
},
|
},
|
||||||
|
|
|
@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "1oom";
|
pname = "1oom";
|
||||||
version = "1.11.6";
|
version = "1.11.6";
|
||||||
|
|
||||||
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"doc"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "1oom-fork";
|
owner = "1oom-fork";
|
||||||
repo = "1oom";
|
repo = "1oom";
|
||||||
|
@ -23,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
|
hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
SDL2
|
SDL2
|
||||||
|
@ -39,10 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
readline
|
readline
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = [
|
strictDeps = true;
|
||||||
"out"
|
enableParallelBuilding = true;
|
||||||
"doc"
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -d $doc/share/doc/1oom
|
install -d $doc/share/doc/1oom
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "aliyun-cli";
|
pname = "aliyun-cli";
|
||||||
version = "3.0.278";
|
version = "3.0.282";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aliyun";
|
owner = "aliyun";
|
||||||
repo = "aliyun-cli";
|
repo = "aliyun-cli";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-SFoTeFKPUlP0clAP4gkPiNNVjqetJ8syNJDhGhNs6vo=";
|
hash = "sha256-EjswkbQVwFx6Z3HeHcB5A7xtjjllRGWLuVFfKvrURDg=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,13 +17,13 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "anyrun";
|
pname = "anyrun";
|
||||||
version = "0-unstable-2025-05-19";
|
version = "0-unstable-2025-05-27";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kirottu";
|
owner = "kirottu";
|
||||||
repo = "anyrun";
|
repo = "anyrun";
|
||||||
rev = "54b462b87129cf059a348fc3a6cc170b9714e0e7";
|
rev = "25367153f225a59c5ce5746583e39a71ff052f09";
|
||||||
hash = "sha256-7VcdMOgQ/PRLr0bnJwNWZX7asrWbRJlLFw21xffm6g8=";
|
hash = "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
cargo-shear,
|
cargo-shear,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "1.3.0";
|
version = "1.3.1";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "cargo-shear";
|
pname = "cargo-shear";
|
||||||
|
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
|
||||||
owner = "Boshen";
|
owner = "Boshen";
|
||||||
repo = "cargo-shear";
|
repo = "cargo-shear";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-OOjN6JI5RWo2J2awX3ts4wlVptQ1mhQEk8acNOVjFz0=";
|
hash = "sha256-y50nYTwUobNyb+uTln9K8of3L9a7G1D/CporgX3obn0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-ha/soHq6lEZUQ/gfk4zQkRBGN3S6npJ2CHI2oyjDsXA=";
|
cargoHash = "sha256-dmpYnYUPKhkB72J/TO0u8y8dDaGrOwYSHghSu/SCUDc=";
|
||||||
|
|
||||||
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
|
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
|
||||||
SHEAR_VERSION = version;
|
SHEAR_VERSION = version;
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cdncheck";
|
pname = "cdncheck";
|
||||||
version = "1.1.21";
|
version = "1.1.22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "projectdiscovery";
|
owner = "projectdiscovery";
|
||||||
repo = "cdncheck";
|
repo = "cdncheck";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-GTYgo5rx4PrWLytqdH3LrasgyEAr1FuPyI26tGRaV0A=";
|
hash = "sha256-EjmQBNYfRl6R01Q3khMqsoYWZM9gG5eiZyJzJrs5ZjQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
|
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
|
||||||
|
|
|
@ -9,15 +9,15 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "diffedit3";
|
pname = "diffedit3";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU=";
|
hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM=";
|
cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA=";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script { };
|
updateScript = nix-update-script { };
|
||||||
|
|
|
@ -6,18 +6,18 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "expr";
|
pname = "expr";
|
||||||
version = "1.17.4";
|
version = "1.17.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "expr-lang";
|
owner = "expr-lang";
|
||||||
repo = "expr";
|
repo = "expr";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-Ss1rs4BiKFOSzfL6VXKZA2Z/LYJ9N+AYkgdVCeintOk=";
|
hash = "sha256-QghgSI6Ri8bXA2xnR0Eu582fLzQXVhLFI9Ul35h/l00=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "${src.name}/repl";
|
sourceRoot = "${src.name}/repl";
|
||||||
|
|
||||||
vendorHash = "sha256-mjqbO3qgX7ak8VRFHnz9UYNoOd+bbHBImDLvnaJhdqI=";
|
vendorHash = "sha256-COfYxqSRyhTJiINbR8z1mbCMrPRFjzkriBGZ5DIY4cg=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fastp";
|
pname = "fastp";
|
||||||
version = "0.24.2";
|
version = "0.26.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenGene";
|
owner = "OpenGene";
|
||||||
repo = "fastp";
|
repo = "fastp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-8AJ6wgqbCqH/f3flgdVYUb5u0C5/CQl6MJe7HmZrp60=";
|
sha256 = "sha256-DrvY2FqTlQU3mJkBp/gM+GHlBlumfYRZItpphaF1xfs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gat";
|
pname = "gat";
|
||||||
version = "0.24.0";
|
version = "0.24.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "koki-develop";
|
owner = "koki-develop";
|
||||||
repo = "gat";
|
repo = "gat";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-2AIRFG4YmEr1ZQ6JjhmRmOc5/BfTbeBd4azy1xQQr3Q=";
|
hash = "sha256-xP7xDuab8QH1PULgF8/FGwDNV/5bYqXkvxgR/Mk4GVw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-9LHTyIL0+aJAUJsn3m1SUrZYM9JLo70JY0zb1oVFJFo=";
|
vendorHash = "sha256-1uIpgcl+6H7aleW28YE8IidJysEB2n+wt2Dz0kZGNzk=";
|
||||||
|
|
||||||
env.CGO_ENABLED = 0;
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitleaks";
|
pname = "gitleaks";
|
||||||
version = "8.27.0";
|
version = "8.27.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zricethezav";
|
owner = "zricethezav";
|
||||||
repo = "gitleaks";
|
repo = "gitleaks";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-62Tcj5NiEk4uaGpiallCjDzpkFbuTazfMiemEe+ATLg=";
|
hash = "sha256-Wsd/jyM16Ztkj4vNnui1qZE4v2ZBffdOVHJG4S+YLXU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM=";
|
vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM=";
|
||||||
|
|
|
@ -8,22 +8,22 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (final: {
|
stdenv.mkDerivation (final: {
|
||||||
pname = "glaze";
|
pname = "glaze";
|
||||||
version = "5.3.0";
|
version = "5.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stephenberry";
|
owner = "stephenberry";
|
||||||
repo = "glaze";
|
repo = "glaze";
|
||||||
rev = "v${final.version}";
|
tag = "v${final.version}";
|
||||||
hash = "sha256-o0+V5mSMSHMDm7XEIVn/zHWJoFuGePOSzdLAxmOMxUM=";
|
hash = "sha256-AG6fnax9UZEhGtAUc8bgGijk8q7ge6lDTb0XjqL+kks=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
cmakeFlags = [ (lib.cmakeBool "glaze_ENABLE_AVX2" enableAvx2) ];
|
cmakeFlags = [ (lib.cmakeBool "glaze_ENABLE_AVX2" enableAvx2) ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Extremely fast, in memory, JSON and interface library for modern C++";
|
description = "Extremely fast, in memory, JSON and interface library for modern C++";
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
maintainers = with maintainers; [ moni ];
|
maintainers = with lib.maintainers; [ moni ];
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-ios";
|
pname = "go-ios";
|
||||||
version = "1.0.176";
|
version = "1.0.177";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "danielpaulus";
|
owner = "danielpaulus";
|
||||||
repo = "go-ios";
|
repo = "go-ios";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A=";
|
sha256 = "sha256-PfFDM/thq+OP3PeiX7qfBZYG//el0U3CkpJWzFbzVqs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "hcp";
|
pname = "hcp";
|
||||||
version = "0.9.1";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "hcp";
|
repo = "hcp";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-53UTxf83jc2tyWJe+BHSitwpQVc6Ecq0wsf8avGPJcM=";
|
hash = "sha256-uiPNHrhMwYLB7ANgcJwfupvya/pUUQICm48/Vac8s40=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk=";
|
vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk=";
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "htmlhint";
|
pname = "htmlhint";
|
||||||
version = "1.2.0";
|
version = "1.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "htmlhint";
|
owner = "htmlhint";
|
||||||
repo = "HTMLHint";
|
repo = "HTMLHint";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-kn1HwOHJq4B+R/YIFQvvvG4efA7iVUVWLV8vfzbNEpA=";
|
hash = "sha256-h40diAM96jQRXIaPqDoQCoB4guMJCMIr9MxbpB7bb8A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-8YeaMU/maXN8Vvy5BYqge4Ky5/Ln4GJ7stVe3y+8uU4=";
|
npmDepsHash = "sha256-VCeMyreQb9DjX1Leyt0vvoejdgG11Rhs3PAFsieeSCs=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
|
changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
|
||||||
|
|
|
@ -7,17 +7,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "httm";
|
pname = "httm";
|
||||||
version = "0.47.1";
|
version = "0.48.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kimono-koans";
|
owner = "kimono-koans";
|
||||||
repo = "httm";
|
repo = "httm";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-quIyyGz9tA0WdfpftbgPZ83YynL/9SV0jRZW+zp0voI=";
|
hash = "sha256-55rUNITdz8lM0yuQQrNhXCKxwx4m7FPVhE1usEAVj0I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-cPcQ0RPuTW3z4hv9EZGOqp0SY/4HtJ3fGuelqEQwFtE=";
|
cargoHash = "sha256-Hbn+PlmJ9FiwHme3kXjvG7m2rkgR4nGnpTT04JHJrao=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -10,17 +10,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "inputplumber";
|
pname = "inputplumber";
|
||||||
version = "0.58.2";
|
version = "0.58.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ShadowBlip";
|
owner = "ShadowBlip";
|
||||||
repo = "InputPlumber";
|
repo = "InputPlumber";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-G4RJansuv7U69l1QIfGp/cQqFtjY8BCMBcA9fiPMhHk=";
|
hash = "sha256-Ozd/MfPoEXodPnjNkmBGGJQCKFSuKr/SrnncDWbhiY8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-ftIUollVuiL0a76D7WMvW5bzNUdTMebRVbWQYu2LfIA=";
|
cargoHash = "sha256-dzPBEIGOOplG+td78Ujm66kPFGAHgI1d68IU4KTQtxE=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -15,13 +15,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "iterm2";
|
pname = "iterm2";
|
||||||
version = "3.5.11";
|
version = "3.5.14";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://iterm2.com/downloads/stable/iTerm2-${
|
url = "https://iterm2.com/downloads/stable/iTerm2-${
|
||||||
lib.replaceStrings [ "." ] [ "_" ] version
|
lib.replaceStrings [ "." ] [ "_" ] version
|
||||||
}.zip";
|
}.zip";
|
||||||
hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI=";
|
hash = "sha256-cF7gg4kT0z/7Qu7d6AyXpnvrSQ937JbFUgpXw5F4AWE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontFixup = true;
|
dontFixup = true;
|
||||||
|
|
|
@ -9,12 +9,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.126.1";
|
version = "0.126.2";
|
||||||
pname = "jbang";
|
pname = "jbang";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||||
sha256 = "sha256-lFb8j1hl47buUKZjFNuSaQVr5IW++eame5vPi2Vi1o8=";
|
sha256 = "sha256-sSmkY1OSaPsxoRTrvl/L3LjWexZeLn5t3s8VFGBGTyw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
lib,
|
lib,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
yq,
|
|
||||||
versionCheckHook,
|
versionCheckHook,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
|
@ -10,25 +9,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "kanidm-provision";
|
pname = "kanidm-provision";
|
||||||
version = "1.2.1";
|
version = "1.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "oddlama";
|
owner = "oddlama";
|
||||||
repo = "kanidm-provision";
|
repo = "kanidm-provision";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI=";
|
hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml
|
|
||||||
'';
|
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk=";
|
cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
yq # for `tomlq`
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||||
versionCheckProgramArg = "--version";
|
versionCheckProgramArg = "--version";
|
||||||
|
|
|
@ -48,15 +48,17 @@ stdenv.mkDerivation {
|
||||||
gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1)
|
gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItems = [
|
||||||
name = "keymapp";
|
(makeDesktopItem {
|
||||||
icon = "keymapp";
|
name = "keymapp";
|
||||||
desktopName = "Keymapp";
|
icon = "keymapp";
|
||||||
categories = [
|
desktopName = "Keymapp";
|
||||||
"Settings"
|
categories = [
|
||||||
"HardwareSettings"
|
"Settings"
|
||||||
];
|
"HardwareSettings"
|
||||||
type = "Application";
|
];
|
||||||
exec = "keymapp";
|
type = "Application";
|
||||||
};
|
exec = "keymapp";
|
||||||
|
})
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
php.buildComposerProject2 (finalAttrs: {
|
php.buildComposerProject2 (finalAttrs: {
|
||||||
pname = "kimai";
|
pname = "kimai";
|
||||||
version = "2.34.0";
|
version = "2.35.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kimai";
|
owner = "kimai";
|
||||||
repo = "kimai";
|
repo = "kimai";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM=";
|
hash = "sha256-QcrlwKpnKuTrJ7U8BzUsxKnJoFzV/U+ZUj5v8FcJXvI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
php = php.buildEnv {
|
php = php.buildEnv {
|
||||||
|
@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI=";
|
vendorHash = "sha256-hENucMcLgG6w0hUF/tnXvFYssgqQLspD+36Jl4cJmig=";
|
||||||
|
|
||||||
composerNoPlugins = false;
|
composerNoPlugins = false;
|
||||||
composerNoScripts = false;
|
composerNoScripts = false;
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "korrect";
|
pname = "korrect";
|
||||||
version = "0.1.3";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit (finalAttrs) pname version;
|
inherit (finalAttrs) pname version;
|
||||||
hash = "sha256-U363YI1CQg7KAUtzN2GPm4fNnD3TgJy+6hT/3JZ8e2s=";
|
hash = "sha256-/tFrHTZ6YHnN9OvoHBJWEnwX780DYrs0f5wV1dPyAcc=";
|
||||||
};
|
};
|
||||||
cargoHash = "sha256-WP03Gv+Nai834xurVzdzV4uLA8fT/lbdu4zGWUgDKJo=";
|
cargoHash = "sha256-bG31pqI/eB+J0FUq/lWak6Ekf+00JiCfuKZdyUkIAAw=";
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
|
|
@ -1,32 +1,37 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchFromGitHub,
|
||||||
cmake,
|
cmake,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libdiscid";
|
pname = "libdiscid";
|
||||||
version = "0.6.4";
|
version = "0.6.5";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz";
|
owner = "metabrainz";
|
||||||
sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI=";
|
repo = "libdiscid";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-lGq2iGt7c4h8HntEPeQcd7X+IykRLm0kvjrLswRWSSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit";
|
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit";
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "C library for creating MusicBrainz DiscIDs from audio CDs";
|
description = "C library for creating MusicBrainz DiscIDs from audio CDs";
|
||||||
homepage = "http://musicbrainz.org/doc/libdiscid";
|
homepage = "https://musicbrainz.org/doc/libdiscid";
|
||||||
maintainers = with maintainers; [ ehmry ];
|
maintainers = with maintainers; [ ehmry ];
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "luau";
|
pname = "luau";
|
||||||
version = "0.676";
|
version = "0.677";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "luau-lang";
|
owner = "luau-lang";
|
||||||
repo = "luau";
|
repo = "luau";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-Zmg1ah5um9ByBTvuDTrEBg1V2qlrg7AQcOlJvK5u/cg=";
|
hash = "sha256-cX0WoiK1CZBwPrQfYSJAGcQzM91Trn3PGsQigGX8jds=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "maeparser";
|
pname = "maeparser";
|
||||||
version = "1.3.2";
|
version = "1.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "schrodinger";
|
owner = "schrodinger";
|
||||||
repo = "maeparser";
|
repo = "maeparser";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-LTE1YGw6DiWnpUGB9x3vFVArcYd8zO49b4tqpqK30eA=";
|
sha256 = "sha256-xRyf/n8ezmMPMhlQFapVpnT2LReLe7spXB9jFC+VPRA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -27,15 +27,15 @@
|
||||||
sparsehash,
|
sparsehash,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "mapnik";
|
pname = "mapnik";
|
||||||
version = "4.0.7";
|
version = "4.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mapnik";
|
owner = "mapnik";
|
||||||
repo = "mapnik";
|
repo = "mapnik";
|
||||||
rev = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-gJktRWcJiSGxxjvWFt+Kl9d7g+TOSPk2PfGP0LIVxt4=";
|
hash = "sha256-EhRMG0xPOGwcRAMQD2B4z7nVlXQf4HFFfL3oUaUfXBY=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -47,18 +47,14 @@ stdenv.mkDerivation rec {
|
||||||
rm -r scons
|
rm -r scons
|
||||||
# Remove bundled 'sparsehash' directory in favor of 'sparsehash' package
|
# Remove bundled 'sparsehash' directory in favor of 'sparsehash' package
|
||||||
rm -r deps/mapnik/sparsehash
|
rm -r deps/mapnik/sparsehash
|
||||||
|
# Remove bundled 'protozero' directory in favor of 'protozero' package
|
||||||
|
rm -r deps/mapbox/protozero
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# a distinct dev output makes python-mapnik fail
|
# a distinct dev output makes python-mapnik fail
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty,
|
|
||||||
# as it provides the wrong libdir. The workaround is to just rely on
|
|
||||||
# pkg-config to locate harfbuzz shared object files.
|
|
||||||
# Upstream HarfBuzz wants to drop CMake support anyway.
|
|
||||||
# See discussion: https://github.com/mapnik/mapnik/issues/4265
|
|
||||||
./cmake-harfbuzz.patch
|
|
||||||
# Account for full paths when generating libmapnik.pc
|
# Account for full paths when generating libmapnik.pc
|
||||||
./export-pkg-config-full-paths.patch
|
./export-pkg-config-full-paths.patch
|
||||||
# Use 'sparsehash' package.
|
# Use 'sparsehash' package.
|
||||||
|
@ -75,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||||
cairo
|
cairo
|
||||||
freetype
|
freetype
|
||||||
gdal
|
gdal
|
||||||
harfbuzz
|
(harfbuzz.override { withIcu = true; })
|
||||||
icu
|
icu
|
||||||
libjpeg
|
libjpeg
|
||||||
libpng
|
libpng
|
||||||
|
@ -97,6 +93,8 @@ stdenv.mkDerivation rec {
|
||||||
(lib.cmakeBool "BUILD_DEMO_CPP" false)
|
(lib.cmakeBool "BUILD_DEMO_CPP" false)
|
||||||
## Would require QT otherwise.
|
## Would require QT otherwise.
|
||||||
(lib.cmakeBool "BUILD_DEMO_VIEWER" false)
|
(lib.cmakeBool "BUILD_DEMO_VIEWER" false)
|
||||||
|
# disable the find_package call and force pkg-config, see https://github.com/mapnik/mapnik/pull/4270
|
||||||
|
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_harfbuzz" true)
|
||||||
# Use 'protozero' package.
|
# Use 'protozero' package.
|
||||||
(lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true)
|
(lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true)
|
||||||
# macOS builds fail when using memory mapped file cache.
|
# macOS builds fail when using memory mapped file cache.
|
||||||
|
@ -118,19 +116,19 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p $out/bin
|
install -Dm755 ../utils/mapnik-config/mapnik-config -t $out/bin
|
||||||
cp ../utils/mapnik-config/mapnik-config $out/bin/mapnik-config
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Open source toolkit for developing mapping applications";
|
description = "Open source toolkit for developing mapping applications";
|
||||||
homepage = "https://mapnik.org";
|
homepage = "https://mapnik.org";
|
||||||
maintainers = with maintainers; [
|
changelog = "https://github.com/mapnik/mapnik/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||||
|
maintainers = with lib.maintainers; [
|
||||||
hrdinka
|
hrdinka
|
||||||
hummeltech
|
hummeltech
|
||||||
];
|
];
|
||||||
teams = [ teams.geospatial ];
|
teams = [ lib.teams.geospatial ];
|
||||||
license = licenses.lgpl21Plus;
|
license = lib.licenses.lgpl21Plus;
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
})
|
|
@ -6,19 +6,19 @@
|
||||||
|
|
||||||
buildGoModule (finalAttrs: {
|
buildGoModule (finalAttrs: {
|
||||||
pname = "mcphost";
|
pname = "mcphost";
|
||||||
version = "0.7.1";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mark3labs";
|
owner = "mark3labs";
|
||||||
repo = "mcphost";
|
repo = "mcphost";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-4vKzrT/1pEupiW3IaQV6d4Y2QHKNBH8sCA4TP8qn+50=";
|
hash = "sha256-GnPabs21TS9SfpJBQ2g8AHJPoDnlxmZM/HKWcLPcwFg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw=";
|
vendorHash = "sha256-0Q9Rn4K3wiZ2tQ2mP2Uh+Hjg1gAFE+AbJR/LA39C8Xs=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP";
|
description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
|
||||||
homepage = "https://github.com/mark3labs/mcphost";
|
homepage = "https://github.com/mark3labs/mcphost";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ drupol ];
|
maintainers = with lib.maintainers; [ drupol ];
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "moar";
|
pname = "moar";
|
||||||
version = "1.31.7";
|
version = "1.31.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "walles";
|
owner = "walles";
|
||||||
repo = "moar";
|
repo = "moar";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-0/V9baRscZFMyvVsSfmxZJdd22BgqqdGcKa7rh210x8=";
|
hash = "sha256-Ql2RWE8yttUSWZf4kJxv8l2lDBetJ7JB7W7A8GYVkyg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";
|
vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";
|
||||||
|
|
|
@ -10,15 +10,15 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mongodb-atlas-cli";
|
pname = "mongodb-atlas-cli";
|
||||||
version = "1.42.2";
|
version = "1.43.2";
|
||||||
|
|
||||||
vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w=";
|
vendorHash = "sha256-Pem+3HH/bdf1SulsLo/5hsFYN8p7kQve0vXptUFnvsM=";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mongodb";
|
owner = "mongodb";
|
||||||
repo = "mongodb-atlas-cli";
|
repo = "mongodb-atlas-cli";
|
||||||
rev = "refs/tags/atlascli/v${version}";
|
rev = "refs/tags/atlascli/v${version}";
|
||||||
sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro=";
|
sha256 = "sha256-Xb/6kgqee38DqbLPLkel8NhXxdjq4UYX4E/y3xUW7og=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
|
||||||
coreutils,
|
|
||||||
|
|
||||||
perl,
|
perl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
|
@ -22,38 +20,23 @@
|
||||||
nixosTests,
|
nixosTests,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "multipath-tools";
|
pname = "multipath-tools";
|
||||||
version = "0.9.8";
|
version = "0.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "opensvc";
|
owner = "opensvc";
|
||||||
repo = "multipath-tools";
|
repo = "multipath-tools";
|
||||||
tag = version;
|
tag = finalAttrs.version;
|
||||||
sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk=";
|
hash = "sha256-H5DY15On3mFwUHQhmC9s2thm0TUUIZbXM/Ot2FPL41Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Backport build fix for musl libc 1.2.5
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch";
|
|
||||||
hash = "sha256-3Qt8zfrWi9aOdqMObZQaNAaXDmjhvSYrXK7qycC9L1Q=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace create-config.mk \
|
|
||||||
--replace-fail /bin/echo ${coreutils}/bin/echo
|
|
||||||
|
|
||||||
substituteInPlace multipathd/multipathd.service.in \
|
|
||||||
--replace-fail /sbin/multipathd "$out/bin/multipathd"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
perl
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
udevCheckHook
|
udevCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
json_c
|
json_c
|
||||||
libaio
|
libaio
|
||||||
|
@ -64,6 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
systemd
|
systemd
|
||||||
util-linuxMinimal # for libmount
|
util-linuxMinimal # for libmount
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
|
@ -87,10 +71,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Tools for the Linux multipathing storage driver";
|
description = "Tools for the Linux multipathing storage driver";
|
||||||
homepage = "http://christophe.varoqui.free.fr/";
|
homepage = "http://christophe.varoqui.free.fr/";
|
||||||
license = licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -11,17 +11,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "netavark";
|
pname = "netavark";
|
||||||
version = "1.15.1";
|
version = "1.15.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = "netavark";
|
repo = "netavark";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-/X0G26XuIBVLnXVADws+CGWwDA8IwTs/XEbA0slaazs=";
|
hash = "sha256-sZzbhlrjTuMwOm0+vBMSqHbpqLGhz6jExpBSokqj/VE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-orhYOBZDfrbXJ+nNBu2nsiTUbpKuGWmfuryCzyXSjG0=";
|
cargoHash = "sha256-ZIFD76GLe44Hx7+/YgBeixsZ+KuYDHBCzMC91R+uTNw=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "nfpm";
|
pname = "nfpm";
|
||||||
version = "2.42.1";
|
version = "2.43.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "goreleaser";
|
owner = "goreleaser";
|
||||||
repo = "nfpm";
|
repo = "nfpm";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg=";
|
hash = "sha256-HbGO4+wFp2mRBOKNxbnZ9sHUJS25ZQ4RaC1Eaw0kfrg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM=";
|
vendorHash = "sha256-BN+ruaajQuvFa/tECI9s0no6+EFR7BYoa1+Z/YI1PbY=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|
|
@ -6,18 +6,19 @@
|
||||||
gobject-introspection,
|
gobject-introspection,
|
||||||
gtk4-layer-shell,
|
gtk4-layer-shell,
|
||||||
libadwaita,
|
libadwaita,
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "niriswitcher";
|
pname = "niriswitcher";
|
||||||
version = "0.5.2";
|
version = "0.6.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "isaksamsten";
|
owner = "isaksamsten";
|
||||||
repo = "niriswitcher";
|
repo = "niriswitcher";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-jXnob/CJ3wrqYhbFRu7TnnnCrsKaDazD3t9lZoJVhdQ=";
|
hash = "sha256-njEd9s432qlBeQSXRL5gDSIEgzF0qwceND09aGTRo0U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ python3Packages.hatchling ];
|
build-system = [ python3Packages.hatchling ];
|
||||||
|
@ -43,6 +44,8 @@ python3Packages.buildPythonPackage rec {
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Application switcher for niri";
|
description = "Application switcher for niri";
|
||||||
homepage = "https://github.com/isaksamsten/niriswitcher";
|
homepage = "https://github.com/isaksamsten/niriswitcher";
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
|
static ? false,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec {
|
||||||
owner = "notofonts";
|
owner = "notofonts";
|
||||||
repo = "noto-cjk";
|
repo = "noto-cjk";
|
||||||
rev = "Sans${version}";
|
rev = "Sans${version}";
|
||||||
hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
|
hash = "sha256-i3ZKoSy2SVs46IViha+Sg8atH4n3ywgrunHPLtVT4Pk=";
|
||||||
sparseCheckout = [ "Sans/Variable/OTC" ];
|
sparseCheckout = [
|
||||||
|
"Sans/OTC"
|
||||||
|
"Sans/Variable/OTC"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase =
|
||||||
install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
|
let
|
||||||
'';
|
font-path = if static then "Sans/OTC/*.ttc" else "Sans/Variable/OTC/*.otf.ttc";
|
||||||
|
in
|
||||||
|
''
|
||||||
|
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path}
|
||||||
|
'';
|
||||||
|
|
||||||
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
|
static ? false, # whether to build the static version of the font
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec {
|
||||||
owner = "notofonts";
|
owner = "notofonts";
|
||||||
repo = "noto-cjk";
|
repo = "noto-cjk";
|
||||||
rev = "Serif${version}";
|
rev = "Serif${version}";
|
||||||
hash = "sha256-E+Ic7XhomI6cUa+q77gQvMlaLvy+vgTq4NJ58/nPZtk=";
|
hash = "sha256-Bwuu64TAnOnqUgLlBsUw/jnv9emngqFBmVn6zEqySlc=";
|
||||||
sparseCheckout = [ "Serif/Variable/OTC" ];
|
sparseCheckout = [
|
||||||
|
"Serif/OTC"
|
||||||
|
"Serif/Variable/OTC"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase =
|
||||||
install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
|
let
|
||||||
'';
|
font-path = if static then "Serif/OTC/*.ttc" else "Serif/Variable/OTC/*.otf.ttc";
|
||||||
|
in
|
||||||
|
''
|
||||||
|
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path}
|
||||||
|
'';
|
||||||
|
|
||||||
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
||||||
|
|
||||||
|
@ -48,6 +56,7 @@ stdenvNoCC.mkDerivation rec {
|
||||||
maintainers = with maintainers; [
|
maintainers = with maintainers; [
|
||||||
mathnerd314
|
mathnerd314
|
||||||
emily
|
emily
|
||||||
|
leana8959
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "nu_scripts";
|
pname = "nu_scripts";
|
||||||
version = "0-unstable-2025-05-22";
|
version = "0-unstable-2025-06-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nushell";
|
owner = "nushell";
|
||||||
repo = "nu_scripts";
|
repo = "nu_scripts";
|
||||||
rev = "765555beddc3c81555e6b70abb2542c37a1c0ad6";
|
rev = "6fe7713322d95be89677389f812eceab6d4b89e2";
|
||||||
hash = "sha256-/LoeL4BILPSOv3jnURcuuQhuRLdE0amBGnEOTB+LLgI=";
|
hash = "sha256-Dq5KwKpnpX9YJIj7FM5fNaeMNdk/BHji2CesIE6Ndps=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -27,13 +27,13 @@ let
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "nvidia-container-toolkit";
|
pname = "nvidia-container-toolkit";
|
||||||
version = "1.17.7";
|
version = "1.17.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NVIDIA";
|
owner = "NVIDIA";
|
||||||
repo = "nvidia-container-toolkit";
|
repo = "nvidia-container-toolkit";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-AQi61oot4fdMvQ8A139AvygxN9U7EM1YkJau3zAy3+I=";
|
hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "openapi-python-client";
|
pname = "openapi-python-client";
|
||||||
version = "0.24.3";
|
version = "0.25.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
owner = "openapi-generators";
|
owner = "openapi-generators";
|
||||||
repo = "openapi-python-client";
|
repo = "openapi-python-client";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-EAHwICY8bjqYt0yGSG+SMcyTqeftfGCGTE4pJE120Mo=";
|
hash = "sha256-bFGqOrBPoywx/r35zpViAWUGiF1ZL3IG1E3TA+Qa354=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "packer";
|
pname = "packer";
|
||||||
version = "1.13.0";
|
version = "1.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "packer";
|
repo = "packer";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-MWVNDRtvH33fby17rj8Fdc/14NGuxWIRNG6B+onUK+M=";
|
hash = "sha256-8DKMRiqv0XasLvFHGscpet51ZLVJjWjAYP8bLgVRIyQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-aXeYGyMn+lnsfcQMJXRt1uZsdi9np26sMna6Ch1swbg=";
|
vendorHash = "sha256-aXeYGyMn+lnsfcQMJXRt1uZsdi9np26sMna6Ch1swbg=";
|
||||||
|
|
73
pkgs/by-name/pa/packet/package.nix
Normal file
73
pkgs/by-name/pa/packet/package.nix
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
cargo,
|
||||||
|
meson,
|
||||||
|
ninja,
|
||||||
|
pkg-config,
|
||||||
|
protobuf,
|
||||||
|
rustPlatform,
|
||||||
|
rustc,
|
||||||
|
wrapGAppsHook4,
|
||||||
|
cairo,
|
||||||
|
dbus,
|
||||||
|
gdk-pixbuf,
|
||||||
|
glib,
|
||||||
|
gtk4,
|
||||||
|
libadwaita,
|
||||||
|
pango,
|
||||||
|
blueprint-compiler,
|
||||||
|
desktop-file-utils,
|
||||||
|
appstream,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
pname = "packet";
|
||||||
|
version = "0.3.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "nozwock";
|
||||||
|
repo = "packet";
|
||||||
|
tag = finalAttrs.version;
|
||||||
|
hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
|
inherit (finalAttrs) pname version src;
|
||||||
|
hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cargo
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
protobuf
|
||||||
|
rustPlatform.cargoSetupHook
|
||||||
|
rustc
|
||||||
|
wrapGAppsHook4
|
||||||
|
blueprint-compiler
|
||||||
|
desktop-file-utils
|
||||||
|
glib
|
||||||
|
gtk4
|
||||||
|
appstream
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
cairo
|
||||||
|
dbus
|
||||||
|
gdk-pixbuf
|
||||||
|
libadwaita
|
||||||
|
pango
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Quick Share client for Linux";
|
||||||
|
homepage = "https://github.com/nozwock/packet";
|
||||||
|
changelog = "https://github.com/nozwock/packet/releases/tag/${finalAttrs.src.tag}";
|
||||||
|
license = lib.licenses.gpl3Plus;
|
||||||
|
maintainers = with lib.maintainers; [ ontake ];
|
||||||
|
mainProgram = "packet";
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
})
|
|
@ -24,7 +24,7 @@ let
|
||||||
in
|
in
|
||||||
python.pkgs.buildPythonApplication rec {
|
python.pkgs.buildPythonApplication rec {
|
||||||
pname = "pdm";
|
pname = "pdm";
|
||||||
version = "2.24.1";
|
version = "2.24.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = python.pkgs.pythonOlder "3.8";
|
disabled = python.pkgs.pythonOlder "3.8";
|
||||||
|
@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
owner = "pdm-project";
|
owner = "pdm-project";
|
||||||
repo = "pdm";
|
repo = "pdm";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY=";
|
hash = "sha256-z2p7guCQrKpDSYRHaGcHuwoTDsprrvJo9SH3sGBILSQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [ "hishel" ];
|
pythonRelaxDeps = [ "hishel" ];
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
|
stdenv,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
callPackage,
|
callPackage,
|
||||||
cmake,
|
cmake,
|
||||||
|
@ -19,7 +20,6 @@
|
||||||
pkg-config,
|
pkg-config,
|
||||||
qt5,
|
qt5,
|
||||||
qt6,
|
qt6,
|
||||||
stdenv,
|
|
||||||
taglib,
|
taglib,
|
||||||
vulkan-headers,
|
vulkan-headers,
|
||||||
vulkan-tools,
|
vulkan-tools,
|
||||||
|
@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
cp -va ${sources.qmvk.src}/* qmvk/
|
cp -va ${sources.qmvk.src}/* qmvk/
|
||||||
chmod --recursive 744 qmvk
|
chmod --recursive 744 qmvk
|
||||||
popd
|
popd
|
||||||
|
substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \
|
||||||
|
--replace-fail "getSubmitInfo()" "getSubmitInfo(0)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
|
|
|
@ -5,13 +5,14 @@
|
||||||
let
|
let
|
||||||
self = {
|
self = {
|
||||||
pname = "qmplay2";
|
pname = "qmplay2";
|
||||||
version = "24.06.16";
|
version = "25.01.19";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zaps166";
|
owner = "zaps166";
|
||||||
repo = "QMPlay2";
|
repo = "QMPlay2";
|
||||||
rev = self.version;
|
tag = self.version;
|
||||||
hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
|
hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA=";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
@ -19,13 +20,13 @@
|
||||||
|
|
||||||
qmvk = {
|
qmvk = {
|
||||||
pname = "qmvk";
|
pname = "qmvk";
|
||||||
version = "0-unstable-2024-04-19";
|
version = "0-unstable-2025-06-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zaps166";
|
owner = "zaps166";
|
||||||
repo = "QmVk";
|
repo = "QmVk";
|
||||||
rev = "5c5c2942255820b6343afdfeea0405cd3b36870e";
|
rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2";
|
||||||
hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw=";
|
hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
rainfrog,
|
rainfrog,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.3.1";
|
version = "0.3.2";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -17,11 +17,11 @@ rustPlatform.buildRustPackage {
|
||||||
owner = "achristmascarl";
|
owner = "achristmascarl";
|
||||||
repo = "rainfrog";
|
repo = "rainfrog";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw=";
|
hash = "sha256-3oRuJytFGPfWLoxtrpgEwRWAPE8HGct5PqU1mxDinZs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys=";
|
cargoHash = "sha256-W/3UNZw3gHVI/3uIzyaDmKGjM8gsfcr86+Vxlfm9Yb4=";
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
tests.version = testers.testVersion {
|
tests.version = testers.testVersion {
|
||||||
|
|
|
@ -9,17 +9,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "reindeer";
|
pname = "reindeer";
|
||||||
version = "2025.05.26.00";
|
version = "2025.06.02.00";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "facebookincubator";
|
owner = "facebookincubator";
|
||||||
repo = "reindeer";
|
repo = "reindeer";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-I5I5m9UutBMgX7PygPjMgglqvRfZxuWiyJ4l+77WYAQ=";
|
hash = "sha256-bKsMR3ubAfeZNVA3Q7RpDmaD9UlZUkVWTi5zevytOj0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-i0HAT8L9rf0r/jOqDFe60PakXwHz9lr4gwXm0ZwN4No=";
|
cargoHash = "sha256-PNCcTztLMt0d8L+tcvOgl4y85Zs4CJR6fDehUImNu6Y=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -6,17 +6,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "ripsecrets";
|
pname = "ripsecrets";
|
||||||
version = "0.1.9";
|
version = "0.1.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sirwart";
|
owner = "sirwart";
|
||||||
repo = "ripsecrets";
|
repo = "ripsecrets";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg=";
|
hash = "sha256-JCImUgicoXII64rK/Hch/0gJQE81Fw3h512w/vHUwAI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-AO0EL2JNwrqwUa7QLNB8/fjLP3HzBqidHR21YSmrMqg=";
|
cargoHash = "sha256-2HsUNN3lyGb/eOUEN/vTOQbAy59DQSzIaOqdk9+KhfU=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Command-line tool to prevent committing secret keys into your source code";
|
description = "Command-line tool to prevent committing secret keys into your source code";
|
||||||
|
|
|
@ -85,6 +85,10 @@ stdenv.mkDerivation rec {
|
||||||
# Backport Python 3.11 fix to v5 from v6.26
|
# Backport Python 3.11 fix to v5 from v6.26
|
||||||
# https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc
|
# https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc
|
||||||
./root5-python311-fix.patch
|
./root5-python311-fix.patch
|
||||||
|
|
||||||
|
# Backport Python 3.13 fix to v5 from v6.25
|
||||||
|
# https://github.com/root-project/root/commit/9aa67a863482eef8cf50850b9ac3724e35f58781
|
||||||
|
./python313-PyCFunction_Call.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://github.com/root-project/root/issues/13216
|
# https://github.com/root-project/root/issues/13216
|
||||||
|
|
14
pkgs/by-name/ro/root5/python313-PyCFunction_Call.patch
Normal file
14
pkgs/by-name/ro/root5/python313-PyCFunction_Call.patch
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
--- a/bindings/pyroot/src/TCustomPyTypes.cxx
|
||||||
|
+++ b/bindings/pyroot/src/TCustomPyTypes.cxx
|
||||||
|
@@ -240,7 +240,11 @@
|
||||||
|
// the function is globally shared, so set and reset its "self" (ok, b/c of GIL)
|
||||||
|
Py_INCREF( self );
|
||||||
|
func->m_self = self;
|
||||||
|
+#if PY_VERSION_HEX >= 0x03090000
|
||||||
|
+ PyObject* result = PyObject_Call( (PyObject*)func, args, kw );
|
||||||
|
+#else
|
||||||
|
PyObject* result = PyCFunction_Call( (PyObject*)func, args, kw );
|
||||||
|
+#endif
|
||||||
|
func->m_self = 0;
|
||||||
|
Py_DECREF( self );
|
||||||
|
Py_DECREF( args );
|
|
@ -11,16 +11,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "sbctl";
|
pname = "sbctl";
|
||||||
version = "0.16";
|
version = "0.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Foxboron";
|
owner = "Foxboron";
|
||||||
repo = "sbctl";
|
repo = "sbctl";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s=";
|
hash = "sha256-7dCaWemkus2GHxILBEx5YvzdAmv89JfcPbqZZ6QwriI";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A=";
|
vendorHash = "sha256-gpHEJIbLnB0OiYB00rHK6OwrnHTHCj/tTVlUzuFjFKY=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
@ -57,17 +57,18 @@ buildGoModule rec {
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Secure Boot key manager";
|
description = "Secure Boot key manager";
|
||||||
mainProgram = "sbctl";
|
mainProgram = "sbctl";
|
||||||
homepage = "https://github.com/Foxboron/sbctl";
|
homepage = "https://github.com/Foxboron/sbctl";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
|
Pokeylooted
|
||||||
raitobezarius
|
raitobezarius
|
||||||
Scrumplex
|
Scrumplex
|
||||||
];
|
];
|
||||||
# go-uefi do not support darwin at the moment:
|
# go-uefi does not support darwin at the moment:
|
||||||
# see upstream on https://github.com/Foxboron/go-uefi/issues/13
|
# see upstream on https://github.com/Foxboron/go-uefi/issues/13
|
||||||
platforms = platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,17 +13,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "swww";
|
pname = "swww";
|
||||||
version = "0.10.1";
|
version = "0.10.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "LGFae";
|
owner = "LGFae";
|
||||||
repo = "swww";
|
repo = "swww";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-HEocjIsij9k4NjcmI8YRW6yzrYh+i3XN9YkRTr5fzDE=";
|
hash = "sha256-qvxG8UhO7MsS0lWVGfHUsBKevAa+VJe41NrcX1ZCJdU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-muWY99OtzG0AumbKpYoxNSjhXHYmkiwElVUdp2zE8a0=";
|
cargoHash = "sha256-Tiszc/COelBRolrrbKpNklk8IVppIhGmxspnTb20LAE=";
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
lz4
|
lz4
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "valijson";
|
pname = "valijson";
|
||||||
version = "1.0.5";
|
version = "1.0.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tristanpenman";
|
owner = "tristanpenman";
|
||||||
repo = "valijson";
|
repo = "valijson";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-f/pYJTvtSXtAmVbKWQfcz/jGSdj7Yt2HNvlCFHx871Q=";
|
hash = "sha256-3hQrCCDOrJx4XwTzJNTRPLghd+uoWKVDISa8rLaGiRM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "virtnbdbackup";
|
pname = "virtnbdbackup";
|
||||||
version = "2.28";
|
version = "2.29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "abbbi";
|
owner = "abbbi";
|
||||||
repo = "virtnbdbackup";
|
repo = "virtnbdbackup";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-oGvsqGraJs0UkmtRN8/2eSIKc0lDD/qxyTakrj3Sqno=";
|
hash = "sha256-KIxRYD+GogYpZnUaBdhFd52sO51Two2vzY4LYRJRCto=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python3Packages; [
|
build-system = with python3Packages; [
|
||||||
|
|
|
@ -8,17 +8,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "weaver";
|
pname = "weaver";
|
||||||
version = "0.15.1";
|
version = "0.15.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "open-telemetry";
|
owner = "open-telemetry";
|
||||||
repo = "weaver";
|
repo = "weaver";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-cEexfPtlbcLR+u5bfwLtDX7iT8ayelSTGdVXSRhKGkY=";
|
hash = "sha256-F7FLQ0EAJFll8Twbg11MQ7fqzzlOntqwqVG9+PjRfQM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-b06bNgRYlsqk/evGubgtnBJM76mm5rQP6VuiHOxyCuw=";
|
cargoHash = "sha256-alk9TIBN69JvrygcODkuDWQB8qvo7pF9HKoMJsNpaY4=";
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# Skip tests requiring network
|
# Skip tests requiring network
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "xa";
|
pname = "xa";
|
||||||
version = "2.3.14";
|
version = "2.4.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
urls = [
|
urls = [
|
||||||
"https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz"
|
"https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz"
|
||||||
"https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz"
|
"https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz"
|
||||||
];
|
];
|
||||||
hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4=";
|
hash = "sha256-Y8EqajKo42TzTwSdiyR39GVgIUGPCLjWtGK+DtO+OsM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeCheckInputs = [ perl ];
|
nativeCheckInputs = [ perl ];
|
||||||
|
@ -23,19 +23,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace Makefile \
|
substituteInPlace Makefile \
|
||||||
--replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
|
--replace-fail "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \
|
||||||
--replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \
|
--replace-fail "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \
|
||||||
--replace "CFLAGS = -O2" "CFLAGS ?=" \
|
--replace-fail "CFLAGS = -O2" "CFLAGS ?=" \
|
||||||
--replace "LDFLAGS = -lc" "LDFLAGS ?= -lc"
|
--replace-fail "LDFLAGS = -lc" "LDFLAGS ?= -lc" \
|
||||||
|
--replace-fail "install: all" "install:"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [ "DESTDIR:=${placeholder "out"}" ];
|
||||||
"DESTDIR:=${placeholder "out"}"
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = false; # while opening file: stat: No such file or directory [Makefile:21: test1.o65]
|
||||||
|
|
||||||
# Running tests in parallel does not work
|
# Running tests in parallel does not work
|
||||||
enableParallelChecking = false;
|
enableParallelChecking = false;
|
||||||
|
@ -63,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
suite, as well as "bare" plain binary object files
|
suite, as well as "bare" plain binary object files
|
||||||
- block structure for label scoping
|
- block structure for label scoping
|
||||||
'';
|
'';
|
||||||
|
mainProgram = "xa";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with lib.maintainers; [ ];
|
maintainers = [ ];
|
||||||
platforms = with lib.platforms; unix;
|
platforms = lib.platforms.unix;
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "zoekt";
|
pname = "zoekt";
|
||||||
version = "3.7.2-2-unstable-2025-05-21";
|
version = "3.7.2-2-unstable-2025-06-04";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sourcegraph";
|
owner = "sourcegraph";
|
||||||
repo = "zoekt";
|
repo = "zoekt";
|
||||||
rev = "91259775f43ca589d8a846e3add881fe59818f82";
|
rev = "fd39c591438fbce188ed9dd0211aefc56bc7322a";
|
||||||
hash = "sha256-r+AQbW8VEh+3/NVSgroX0VT7gFLaEMSZpS90+Wp+MnU=";
|
hash = "sha256-gmpa3Jxh1UPpyWEiAkcTaNEXODVaKEn1b82mDFD/I68=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";
|
vendorHash = "sha256-1WfQbvT5pKZRfs2DWv6+jBpHKGpcxhYAnc+NXvMT6WE=";
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
gitMinimal
|
gitMinimal
|
||||||
|
|
|
@ -294,17 +294,7 @@ stdenv.mkDerivation (
|
||||||
++
|
++
|
||||||
lib.optional (lib.versionAtLeast release_version "15")
|
lib.optional (lib.versionAtLeast release_version "15")
|
||||||
# Just like the `llvm-lit-cfg` patch, but for `polly`.
|
# Just like the `llvm-lit-cfg` patch, but for `polly`.
|
||||||
(getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")
|
(getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch");
|
||||||
++
|
|
||||||
lib.optional (lib.versions.major release_version == "20")
|
|
||||||
# https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests.
|
|
||||||
(
|
|
||||||
fetchpatch {
|
|
||||||
url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch";
|
|
||||||
stripLen = 1;
|
|
||||||
hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk=";
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
[
|
[
|
||||||
|
|
|
@ -31,7 +31,7 @@ let
|
||||||
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
|
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
|
||||||
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
|
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
|
||||||
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
|
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
|
||||||
"20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
|
"20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
|
||||||
"21.0.0-git".gitRelease = {
|
"21.0.0-git".gitRelease = {
|
||||||
rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
|
rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
|
||||||
rev-version = "21.0.0-unstable-2025-06-06";
|
rev-version = "21.0.0-unstable-2025-06-06";
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||||
|
index 7ad350d..6f962ce 100644
|
||||||
|
--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||||
|
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx
|
||||||
|
@@ -43,6 +43,9 @@ static const int losslylosslessarray[][3] = {
|
||||||
|
{ 1, 0, 1 }, // MPEG2MainProfileHighLevel
|
||||||
|
{ 1, 0, 1 }, // MPEG4AVCH264HighProfileLevel4_1
|
||||||
|
{ 1, 0, 1 }, // MPEG4AVCH264BDcompatibleHighProfileLevel4_1
|
||||||
|
+ { 0, 1, 1 }, // HTJ2KLossless
|
||||||
|
+ { 0, 1, 1 }, // HTJ2KRPCLLossless
|
||||||
|
+ { 1, 0, 1 }, // HTJ2K
|
||||||
|
};
|
||||||
|
|
||||||
|
static int TestTransferSyntaxAll()
|
|
@ -2,6 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch2,
|
||||||
cmake,
|
cmake,
|
||||||
enableVTK ? true,
|
enableVTK ? true,
|
||||||
vtk,
|
vtk,
|
||||||
|
@ -14,19 +15,32 @@
|
||||||
openjpeg,
|
openjpeg,
|
||||||
zlib,
|
zlib,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
|
ctestCheckHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = if enablePython then "python-gdcm" else "gdcm";
|
pname = if enablePython then "python-gdcm" else "gdcm";
|
||||||
version = "3.0.24";
|
version = "3.0.25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "malaterre";
|
owner = "malaterre";
|
||||||
repo = "GDCM";
|
repo = "GDCM";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE=";
|
hash = "sha256-PYVVlSqeAZCWvnWPqqWGQIWatMfPYqnrXc7cqi8UseU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches =
|
||||||
|
[
|
||||||
|
./add-missing-losslylosslessarray-in-TestTransferSyntax.patch
|
||||||
|
]
|
||||||
|
++ lib.optionals (lib.versionOlder vtk.version "9.3") [
|
||||||
|
(fetchpatch2 {
|
||||||
|
url = "https://github.com/malaterre/GDCM/commit/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch?full_index=1";
|
||||||
|
hash = "sha256-Yt5f4mxhP5n+L0A/CRq3CxKCqUT7LZ8uKdbCf9P71Zc=";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
cmakeFlags =
|
cmakeFlags =
|
||||||
[
|
[
|
||||||
"-DGDCM_BUILD_APPLICATIONS=ON"
|
"-DGDCM_BUILD_APPLICATIONS=ON"
|
||||||
|
@ -95,11 +109,10 @@ stdenv.mkDerivation rec {
|
||||||
"TestRescaler2"
|
"TestRescaler2"
|
||||||
];
|
];
|
||||||
|
|
||||||
checkPhase = ''
|
nativeCheckInputs = [
|
||||||
runHook preCheck
|
ctestCheckHook
|
||||||
ctest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$'
|
];
|
||||||
runHook postCheck
|
|
||||||
'';
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
# note that when the test data is available to the build via `fetchSubmodules = true`,
|
# note that when the test data is available to the build via `fetchSubmodules = true`,
|
||||||
# a number of additional but much slower tests are enabled
|
# a number of additional but much slower tests are enabled
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index ffb86d4ac..1775b986f 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -177,19 +177,8 @@ endif()
|
|
||||||
|
|
||||||
mapnik_find_package(Freetype REQUIRED)
|
|
||||||
|
|
||||||
-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz
|
|
||||||
-mapnik_find_package(harfbuzz CONFIG QUIET)
|
|
||||||
-if(harfbuzz_FOUND)
|
|
||||||
- message(STATUS "Found harfbuzz native cmake")
|
|
||||||
- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz)
|
|
||||||
-else()
|
|
||||||
- # Use pkg-config when harfbuzz is not found.
|
|
||||||
- # It might be possible that in future version harfbuzz could only be found via pkg-config.
|
|
||||||
- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
|
|
||||||
- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
|
|
||||||
- mapnik_pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
|
|
||||||
- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
|
||||||
-endif()
|
|
||||||
+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
|
|
||||||
+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
|
||||||
|
|
||||||
if(USE_EXTERNAL_MAPBOX_GEOMETRY)
|
|
||||||
# this is used to provide a way to specify include dirs with CACHE VARIABLES
|
|
|
@ -1,16 +0,0 @@
|
||||||
diff --git a/sqlite3.c b/sqlite3.c
|
|
||||||
index 80433f6..7c234f6 100644
|
|
||||||
--- a/sqlite3.c
|
|
||||||
+++ b/sqlite3.c
|
|
||||||
@@ -231721,6 +231721,11 @@ static int sessionChangesetApply(
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ {
|
|
||||||
+ int rc2 = sqlite3_exec(db, "PRAGMA defer_foreign_keys = 0", 0, 0, 0);
|
|
||||||
+ if( rc==SQLITE_OK ) rc = rc2;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if( (flags & SQLITE_CHANGESETAPPLY_NOSAVEPOINT)==0 ){
|
|
||||||
if( rc==SQLITE_OK ){
|
|
||||||
rc = sqlite3_exec(db, "RELEASE changeset_apply", 0, 0, 0);
|
|
|
@ -1,11 +0,0 @@
|
||||||
diff --git a/sqlite3.pc.in b/sqlite3.pc.in
|
|
||||||
index a9f941b..3799671 100644
|
|
||||||
--- a/sqlite3.pc.in
|
|
||||||
+++ b/sqlite3.pc.in
|
|
||||||
@@ -9,5 +9,5 @@ Name: SQLite
|
|
||||||
Description: SQL database engine
|
|
||||||
Version: @PACKAGE_VERSION@
|
|
||||||
Libs: -L${libdir} -lsqlite3
|
|
||||||
-Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@
|
|
||||||
+Libs.private: @LIBS@
|
|
||||||
Cflags: -I${includedir}
|
|
|
@ -6,7 +6,6 @@
|
||||||
zlib,
|
zlib,
|
||||||
readline,
|
readline,
|
||||||
ncurses,
|
ncurses,
|
||||||
updateAutotoolsGnuConfigScriptsHook,
|
|
||||||
|
|
||||||
# for tests
|
# for tests
|
||||||
python3Packages,
|
python3Packages,
|
||||||
|
@ -19,6 +18,7 @@
|
||||||
interactive ? false,
|
interactive ? false,
|
||||||
|
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
|
buildPackages,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -27,31 +27,19 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sqlite${lib.optionalString interactive "-interactive"}";
|
pname = "sqlite${lib.optionalString interactive "-interactive"}";
|
||||||
version = "3.48.0";
|
version = "3.50.1";
|
||||||
|
|
||||||
# nixpkgs-update: no auto update
|
# nixpkgs-update: no auto update
|
||||||
# NB! Make sure to update ./tools.nix src (in the same directory).
|
# NB! Make sure to update ./tools.nix src (in the same directory).
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz";
|
url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz";
|
||||||
hash = "sha256-rJkvf8o5id5+0f6ZwWNj+Eh5TIwyoVja/U65J6LgL9U=";
|
hash = "sha256-AKZRFNaXz6qP4GMCgddv0bd6/Nlc1eQOxqAsu62/6nE=";
|
||||||
};
|
};
|
||||||
docsrc = fetchurl {
|
docsrc = fetchurl {
|
||||||
url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip";
|
url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip";
|
||||||
hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo=";
|
hash = "sha256-ZiIF9jOC5X0Qceqr08eQjdchFKggqOvPGg1xqdazgrQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://sqlite.org/forum/forumpost/3380558ea82c8a3e
|
|
||||||
# Can be removed with the next release.
|
|
||||||
# Test: pkgsStatic.gnupg
|
|
||||||
./Libs.private.patch
|
|
||||||
|
|
||||||
# https://sqlite.org/forum/forumpost/00f3aab3d3be9690
|
|
||||||
# https://sqlite.org/src/info/d7c07581
|
|
||||||
# TODO: Remove in 3.49.0
|
|
||||||
./3.48.0-fk-conflict-handling.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"bin"
|
"bin"
|
||||||
"dev"
|
"dev"
|
||||||
|
@ -61,8 +49,11 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
separateDebugInfo = stdenv.hostPlatform.isLinux;
|
separateDebugInfo = stdenv.hostPlatform.isLinux;
|
||||||
|
|
||||||
|
depsBuildBuild = [
|
||||||
|
buildPackages.stdenv.cc
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
updateAutotoolsGnuConfigScriptsHook
|
|
||||||
unzip
|
unzip
|
||||||
];
|
];
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -77,9 +68,21 @@ stdenv.mkDerivation rec {
|
||||||
patchShebangs configure
|
patchShebangs configure
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";
|
# sqlite relies on autosetup now; so many of the
|
||||||
|
# previously-understood flags are gone. They should instead be set
|
||||||
|
# on a per-output basis.
|
||||||
|
setOutputFlags = false;
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = toString ([
|
configureFlags =
|
||||||
|
[
|
||||||
|
"--bindir=${placeholder "bin"}/bin"
|
||||||
|
"--includedir=${placeholder "dev"}/include"
|
||||||
|
"--libdir=${placeholder "out"}/lib"
|
||||||
|
]
|
||||||
|
++ lib.optional (!interactive) "--disable-readline"
|
||||||
|
++ lib.optional (stdenv.hostPlatform.isStatic) "--disable-shared";
|
||||||
|
|
||||||
|
env.NIX_CFLAGS_COMPILE = toString [
|
||||||
"-DSQLITE_ENABLE_COLUMN_METADATA"
|
"-DSQLITE_ENABLE_COLUMN_METADATA"
|
||||||
"-DSQLITE_ENABLE_DBSTAT_VTAB"
|
"-DSQLITE_ENABLE_DBSTAT_VTAB"
|
||||||
"-DSQLITE_ENABLE_JSON1"
|
"-DSQLITE_ENABLE_JSON1"
|
||||||
|
@ -100,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DSQLITE_SECURE_DELETE"
|
"-DSQLITE_SECURE_DELETE"
|
||||||
"-DSQLITE_MAX_VARIABLE_NUMBER=250000"
|
"-DSQLITE_MAX_VARIABLE_NUMBER=250000"
|
||||||
"-DSQLITE_MAX_EXPR_DEPTH=10000"
|
"-DSQLITE_MAX_EXPR_DEPTH=10000"
|
||||||
]);
|
];
|
||||||
|
|
||||||
# Test for features which may not be available at compile time
|
# Test for features which may not be available at compile time
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
@ -145,7 +148,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
updateScript = gitUpdater {
|
updateScript = gitUpdater {
|
||||||
# No nicer place to look for patest version.
|
# No nicer place to look for latest version.
|
||||||
url = "https://github.com/sqlite/sqlite.git";
|
url = "https://github.com/sqlite/sqlite.git";
|
||||||
# Expect tags like "version-3.43.0".
|
# Expect tags like "version-3.43.0".
|
||||||
rev-prefix = "version-";
|
rev-prefix = "version-";
|
||||||
|
|
|
@ -19,14 +19,14 @@ let
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "3.48.0";
|
version = "3.50.1";
|
||||||
|
|
||||||
# nixpkgs-update: no auto update
|
# nixpkgs-update: no auto update
|
||||||
src =
|
src =
|
||||||
assert version == sqlite.version;
|
assert version == sqlite.version;
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip";
|
url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip";
|
||||||
hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA=";
|
hash = "sha256-kJBZd3PGCknK67PBrFfbYm+sTZfLUYkIFai1KaTZw9w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
nativeBuildInputs = [ unzip ];
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiohttp-fast-zlib";
|
pname = "aiohttp-fast-zlib";
|
||||||
version = "0.2.3";
|
version = "0.3.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bdraco";
|
owner = "bdraco";
|
||||||
repo = "aiohttp-fast-zlib";
|
repo = "aiohttp-fast-zlib";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-PQ44XFdaolxGQTwzssv1inOUAGAyYghS3SVLq4w5SoA=";
|
hash = "sha256-N38eMxxovpBM3n0cb7glKyBQ9GD79uyFxq5L4pKv248=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
isPyPy,
|
isPyPy,
|
||||||
|
|
||||||
# build-system
|
# build-system
|
||||||
cython,
|
cython_3_1,
|
||||||
|
pkgconfig,
|
||||||
setuptools,
|
setuptools,
|
||||||
|
|
||||||
# native dependencies
|
# native dependencies
|
||||||
|
@ -30,8 +31,10 @@
|
||||||
brotlicffi,
|
brotlicffi,
|
||||||
|
|
||||||
# tests
|
# tests
|
||||||
|
blockbuster,
|
||||||
freezegun,
|
freezegun,
|
||||||
gunicorn,
|
gunicorn,
|
||||||
|
isal,
|
||||||
proxy-py,
|
proxy-py,
|
||||||
pytest-codspeed,
|
pytest-codspeed,
|
||||||
pytest-cov-stub,
|
pytest-cov-stub,
|
||||||
|
@ -41,35 +44,34 @@
|
||||||
python-on-whales,
|
python-on-whales,
|
||||||
re-assert,
|
re-assert,
|
||||||
trustme,
|
trustme,
|
||||||
|
zlib-ng,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiohttp";
|
pname = "aiohttp";
|
||||||
version = "3.11.18";
|
version = "3.12.10";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aio-libs";
|
owner = "aio-libs";
|
||||||
repo = "aiohttp";
|
repo = "aiohttp";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-+vnrYdUz1Stti9XE99InAouKN5kfTSaOuEG9Anxb3gs=";
|
hash = "sha256-ciZGOOfVXYoLzYNIkota3MXMRMxlztf+mFFo0y9r+Lk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(replaceVars ./unvendor-llhttp.patch {
|
|
||||||
llhttpDev = lib.getDev llhttp;
|
|
||||||
llhttpLib = lib.getLib llhttp;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
rm -r vendor
|
rm -r vendor
|
||||||
patchShebangs tools
|
patchShebangs tools
|
||||||
touch .git # tools/gen.py uses .git to find the project root
|
touch .git # tools/gen.py uses .git to find the project root
|
||||||
|
|
||||||
|
# don't install Cython using pip
|
||||||
|
substituteInPlace Makefile \
|
||||||
|
--replace-fail "cythonize: .install-cython" "cythonize:"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
cython
|
cython_3_1
|
||||||
|
pkgconfig
|
||||||
setuptools
|
setuptools
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -77,6 +79,12 @@ buildPythonPackage rec {
|
||||||
make cythonize
|
make cythonize
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
llhttp
|
||||||
|
];
|
||||||
|
|
||||||
|
env.AIOHTTP_USE_SYSTEM_DEPS = true;
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
aiohappyeyeballs
|
aiohappyeyeballs
|
||||||
aiosignal
|
aiosignal
|
||||||
|
@ -94,8 +102,10 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
|
blockbuster
|
||||||
freezegun
|
freezegun
|
||||||
gunicorn
|
gunicorn
|
||||||
|
isal
|
||||||
proxy-py
|
proxy-py
|
||||||
pytest-codspeed
|
pytest-codspeed
|
||||||
pytest-cov-stub
|
pytest-cov-stub
|
||||||
|
@ -105,6 +115,7 @@ buildPythonPackage rec {
|
||||||
python-on-whales
|
python-on-whales
|
||||||
re-assert
|
re-assert
|
||||||
trustme
|
trustme
|
||||||
|
zlib-ng
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests =
|
disabledTests =
|
||||||
|
@ -117,6 +128,8 @@ buildPythonPackage rec {
|
||||||
"test_import_time"
|
"test_import_time"
|
||||||
# racy
|
# racy
|
||||||
"test_uvloop_secure_https_proxy"
|
"test_uvloop_secure_https_proxy"
|
||||||
|
# Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers]
|
||||||
|
"test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection"
|
||||||
]
|
]
|
||||||
# these tests fail with python310 but succeeds with 11+
|
# these tests fail with python310 but succeeds with 11+
|
||||||
++ lib.optionals isPy310 [
|
++ lib.optionals isPy310 [
|
||||||
|
@ -145,7 +158,7 @@ buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
changelog = "https://github.com/aio-libs/aiohttp/blob/v${version}/CHANGES.rst";
|
changelog = "https://docs.aiohttp.org/en/${src.tag}/changes.html";
|
||||||
description = "Asynchronous HTTP Client/Server for Python and asyncio";
|
description = "Asynchronous HTTP Client/Server for Python and asyncio";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
homepage = "https://github.com/aio-libs/aiohttp";
|
homepage = "https://github.com/aio-libs/aiohttp";
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index b0a3ef32..f36132c6 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -79,7 +79,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json
|
|
||||||
generate-llhttp: .llhttp-gen
|
|
||||||
|
|
||||||
.PHONY: cythonize
|
|
||||||
-cythonize: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c
|
|
||||||
+cythonize: $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c
|
|
||||||
|
|
||||||
.install-deps: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c $(call to-hash,$(CYS) $(REQS))
|
|
||||||
@python -m pip install -r requirements/dev.in -c requirements/dev.txt
|
|
||||||
diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd
|
|
||||||
index c2cd5a92..9184ac60 100644
|
|
||||||
--- a/aiohttp/_cparser.pxd
|
|
||||||
+++ b/aiohttp/_cparser.pxd
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t
|
|
||||||
|
|
||||||
|
|
||||||
-cdef extern from "../vendor/llhttp/build/llhttp.h":
|
|
||||||
+cdef extern from "@llhttpDev@/include/llhttp.h":
|
|
||||||
|
|
||||||
struct llhttp__internal_s:
|
|
||||||
int32_t _index
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 2f024e87..feebc638 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -17,13 +17,6 @@ if sys.implementation.name != "cpython":
|
|
||||||
NO_EXTENSIONS = True
|
|
||||||
|
|
||||||
|
|
||||||
-if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists():
|
|
||||||
- print("Install submodules when building from git clone", file=sys.stderr)
|
|
||||||
- print("Hint:", file=sys.stderr)
|
|
||||||
- print(" git submodule update --init", file=sys.stderr)
|
|
||||||
- sys.exit(2)
|
|
||||||
-
|
|
||||||
-
|
|
||||||
# NOTE: makefile cythonizes all Cython modules
|
|
||||||
|
|
||||||
extensions = [
|
|
||||||
@@ -33,12 +26,11 @@ extensions = [
|
|
||||||
[
|
|
||||||
"aiohttp/_http_parser.c",
|
|
||||||
"aiohttp/_find_header.c",
|
|
||||||
- "vendor/llhttp/build/c/llhttp.c",
|
|
||||||
- "vendor/llhttp/src/native/api.c",
|
|
||||||
- "vendor/llhttp/src/native/http.c",
|
|
||||||
],
|
|
||||||
define_macros=[("LLHTTP_STRICT_MODE", 0)],
|
|
||||||
- include_dirs=["vendor/llhttp/build"],
|
|
||||||
+ include_dirs=["@llhttpDev@/include"],
|
|
||||||
+ library_dirs=["@llhttpLib@/lib"],
|
|
||||||
+ libraries=["llhttp"],
|
|
||||||
),
|
|
||||||
Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),
|
|
||||||
Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]),
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aiovodafone";
|
pname = "aiovodafone";
|
||||||
version = "1.0.0";
|
version = "1.1.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.12";
|
disabled = pythonOlder "3.12";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "chemelli74";
|
owner = "chemelli74";
|
||||||
repo = "aiovodafone";
|
repo = "aiovodafone";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-qjhezzetTKBaPeToQ9TSZ3+epgW/nMsADVL3Hb4kTBU=";
|
hash = "sha256-xz5NilxPN5KyC4NYmx4Ax0L3khtD2oo3s7gxXWclCI4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
|
|
@ -1,34 +1,81 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchPypi,
|
fetchFromGitHub,
|
||||||
mock,
|
flaky,
|
||||||
|
hypothesis,
|
||||||
|
pytest-xdist,
|
||||||
|
pytestCheckHook,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
setuptools,
|
setuptools,
|
||||||
|
tomli,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "coverage";
|
pname = "coverage";
|
||||||
version = "7.8.0";
|
version = "7.8.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
# uses f strings
|
src = fetchFromGitHub {
|
||||||
disabled = pythonOlder "3.5";
|
owner = "nedbat";
|
||||||
|
repo = "coveragepy";
|
||||||
src = fetchPypi {
|
tag = version;
|
||||||
inherit pname version;
|
hash = "sha256-PCMGxyG5zIc8iigi9BsuhyuyQindZnewqTgxErT/jHw=";
|
||||||
hash = "sha256-ej1is7A7S2/UGghfNXSHTPlGy0YE0rTT6NyozVcMpQE=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ setuptools ];
|
postPatch = ''
|
||||||
|
# don't write to Nix store
|
||||||
|
substituteInPlace tests/conftest.py \
|
||||||
|
--replace-fail 'if WORKER == "none":' "if False:"
|
||||||
|
'';
|
||||||
|
|
||||||
# No tests in archive
|
build-system = [ setuptools ];
|
||||||
doCheck = false;
|
|
||||||
nativeCheckInputs = [ mock ];
|
optional-dependencies = {
|
||||||
|
toml = lib.optionals (pythonOlder "3.11") [
|
||||||
|
tomli
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
flaky
|
||||||
|
hypothesis
|
||||||
|
pytest-xdist
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
preCheck = ''
|
||||||
|
export PATH="$PATH:$out/bin"
|
||||||
|
# import from $out
|
||||||
|
rm -r coverage
|
||||||
|
'';
|
||||||
|
|
||||||
|
disabledTests = [
|
||||||
|
"test_all_our_source_files"
|
||||||
|
"test_doctest"
|
||||||
|
"test_files_up_one_level"
|
||||||
|
"test_get_encoded_zip_files"
|
||||||
|
"test_metadata"
|
||||||
|
"test_more_metadata"
|
||||||
|
"test_multi"
|
||||||
|
"test_no_duplicate_packages"
|
||||||
|
"test_xdist_sys_path_nuttiness_is_fixed"
|
||||||
|
"test_zipfile"
|
||||||
|
];
|
||||||
|
|
||||||
|
disabledTestPaths = [
|
||||||
|
"tests/test_debug.py"
|
||||||
|
"tests/test_plugins.py"
|
||||||
|
"tests/test_process.py"
|
||||||
|
"tests/test_report.py"
|
||||||
|
"tests/test_venv.py"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Code coverage measurement for python";
|
changelog = "https://github.com/nedbat/coveragepy/blob/${src.tag}/CHANGES.rst";
|
||||||
homepage = "https://coverage.readthedocs.io/";
|
description = "Code coverage measurement for Python";
|
||||||
license = lib.licenses.bsd3;
|
homepage = "https://github.com/nedbat/coveragepy";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = with lib.maintainers; [ dotlambda ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,14 +21,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "databricks-sdk";
|
pname = "databricks-sdk";
|
||||||
version = "0.55.0";
|
version = "0.56.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "databricks";
|
owner = "databricks";
|
||||||
repo = "databricks-sdk-py";
|
repo = "databricks-sdk-py";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-H/LtuqVRW3Ii/z/AU4d/PLxywG41G4aZH3xz+nOM0FY=";
|
hash = "sha256-xMwjyXv/X0rAc2kXk9OyTrYrTJEk3irpDPZ8z6LLSoM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "django-ninja";
|
pname = "django-ninja";
|
||||||
version = "1.4.1";
|
version = "1.4.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||||
owner = "vitalik";
|
owner = "vitalik";
|
||||||
repo = "django-ninja";
|
repo = "django-ninja";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-96JnUFgfuElR7WpiExS2fmK1xxaosd77li36bTLS//U=";
|
hash = "sha256-6uef+e1o7XTp5MRi/NpsJGCFT28bh2UnKdS2IfzzmAY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ flit-core ];
|
build-system = [ flit-core ];
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
poetry-core,
|
uv-build,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
go,
|
go,
|
||||||
ffmpeg-headless,
|
ffmpeg-headless,
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ffmpy";
|
pname = "ffmpy";
|
||||||
version = "0.5.0";
|
version = "0.6.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8.1";
|
disabled = pythonOlder "3.8.1";
|
||||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||||
owner = "Ch00k";
|
owner = "Ch00k";
|
||||||
repo = "ffmpy";
|
repo = "ffmpy";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-spbyz1EyMJRXJTm7TqN9XoqR9ztBKsNZx3NURwV7N2w=";
|
hash = "sha256-U20mBg+428kkka6NY9qc7X8jH8A5bKa++g2+PTn/MYg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -33,13 +33,13 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
# The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.
|
# The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.
|
||||||
for fname in tests/*.py; do
|
for fname in tests/*.py; do
|
||||||
echo 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' >>"$fname"
|
echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])'
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pythonImportsCheck = [ "ffmpy" ];
|
pythonImportsCheck = [ "ffmpy" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ poetry-core ];
|
nativeBuildInputs = [ uv-build ];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
# dependencies
|
# dependencies
|
||||||
filelock,
|
filelock,
|
||||||
fsspec,
|
fsspec,
|
||||||
|
hf-xet,
|
||||||
packaging,
|
packaging,
|
||||||
pyyaml,
|
pyyaml,
|
||||||
requests,
|
requests,
|
||||||
|
@ -25,8 +26,6 @@
|
||||||
safetensors,
|
safetensors,
|
||||||
# hf_transfer
|
# hf_transfer
|
||||||
hf-transfer,
|
hf-transfer,
|
||||||
# hf_xet
|
|
||||||
hf-xet,
|
|
||||||
# fastai
|
# fastai
|
||||||
toml,
|
toml,
|
||||||
fastai,
|
fastai,
|
||||||
|
@ -41,14 +40,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "huggingface-hub";
|
pname = "huggingface-hub";
|
||||||
version = "0.31.4";
|
version = "0.32.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "huggingface";
|
owner = "huggingface";
|
||||||
repo = "huggingface_hub";
|
repo = "huggingface_hub";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-V/FbInskBHefbPkbwQyx+aWBcdrk5WaXXbR/v3fNU+Y=";
|
hash = "sha256-qCFwzhjQI1L7mgSSqDPw59woTSTDY0boWSHcm7dgx2A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
@ -56,6 +55,7 @@ buildPythonPackage rec {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
filelock
|
filelock
|
||||||
fsspec
|
fsspec
|
||||||
|
hf-xet
|
||||||
packaging
|
packaging
|
||||||
pyyaml
|
pyyaml
|
||||||
requests
|
requests
|
||||||
|
|
|
@ -8,14 +8,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "json-repair";
|
pname = "json-repair";
|
||||||
version = "0.46.0";
|
version = "0.46.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mangiucugna";
|
owner = "mangiucugna";
|
||||||
repo = "json_repair";
|
repo = "json_repair";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-MfjWZYDYiFBTy0Tsm0OKY/89ziSTXNB5m99VkpS0Mco=";
|
hash = "sha256-Xj3gLduN5aiy/XJ8jOaJEp4o3iX+PTD6eLBGHoHQ5HM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchPypi,
|
fetchPypi,
|
||||||
|
fetchpatch,
|
||||||
pythonOlder,
|
pythonOlder,
|
||||||
|
|
||||||
# build-system, dependencies
|
# build-system, dependencies
|
||||||
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
# tests
|
# tests
|
||||||
cython,
|
cython,
|
||||||
|
git,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
pytest-mock,
|
pytest-mock,
|
||||||
}:
|
}:
|
||||||
|
@ -28,6 +29,14 @@ buildPythonPackage rec {
|
||||||
hash = "sha256-xWqZ7J32aaQGYv5GlgMhr25LFBBsFNsihwnBYo4jhI0=";
|
hash = "sha256-xWqZ7J32aaQGYv5GlgMhr25LFBBsFNsihwnBYo4jhI0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
# TODO: Remove in 0.19.0
|
||||||
|
url = "https://github.com/mesonbuild/meson-python/commit/1e69e7a23f2b24d688dc4220e93de6f0e2bcf9d2.patch";
|
||||||
|
hash = "sha256-FC2ll/OrLV1R0CDB6UkrknVASJQ7rSU+sApdAk75x44=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
@ -42,58 +51,11 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
cython
|
cython
|
||||||
|
git
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
pytest-mock
|
pytest-mock
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
# Tests require a Git checkout
|
|
||||||
"test_configure_data"
|
|
||||||
"test_contents"
|
|
||||||
"test_contents"
|
|
||||||
"test_contents_license_file"
|
|
||||||
"test_contents_subdirs"
|
|
||||||
"test_contents_unstaged"
|
|
||||||
"test_detect_wheel_tag_module"
|
|
||||||
"test_detect_wheel_tag_script"
|
|
||||||
"test_dynamic_version"
|
|
||||||
"test_editable_install"
|
|
||||||
"test_editable_verbose"
|
|
||||||
"test_editble_reentrant"
|
|
||||||
"test_entrypoints"
|
|
||||||
"test_executable_bit"
|
|
||||||
"test_executable_bit"
|
|
||||||
"test_generated_files"
|
|
||||||
"test_install_subdir"
|
|
||||||
"test_license_pep639"
|
|
||||||
"test_limited_api"
|
|
||||||
"test_link_library_in_subproject"
|
|
||||||
"test_local_lib"
|
|
||||||
"test_long_path"
|
|
||||||
"test_meson_build_metadata"
|
|
||||||
"test_pep621_metadata"
|
|
||||||
"test_pure"
|
|
||||||
"test_purelib_and_platlib"
|
|
||||||
"test_reproducible"
|
|
||||||
"test_rpath"
|
|
||||||
"test_scipy_like"
|
|
||||||
"test_sharedlib_in_package"
|
|
||||||
"test_symlinks"
|
|
||||||
"test_uneeded_rpath"
|
|
||||||
"test_user_args"
|
|
||||||
"test_vendored_meson"
|
|
||||||
];
|
|
||||||
# meson-python respectes MACOSX_DEPLOYMENT_TARGET, but compares it with the
|
|
||||||
# actual platform version during tests, which mismatches.
|
|
||||||
# https://github.com/mesonbuild/meson-python/issues/760
|
|
||||||
preCheck =
|
|
||||||
if stdenv.hostPlatform.isDarwin then
|
|
||||||
''
|
|
||||||
unset MACOSX_DEPLOYMENT_TARGET
|
|
||||||
''
|
|
||||||
else
|
|
||||||
null;
|
|
||||||
|
|
||||||
setupHooks = [ ./add-build-flags.sh ];
|
setupHooks = [ ./add-build-flags.sh ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -10,14 +10,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nagiosplugin";
|
pname = "nagiosplugin";
|
||||||
version = "1.3.3";
|
version = "1.4.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y=";
|
hash = "sha256-IxabBKI8StRBnvm3Zm1AH0jfMkez38P4dL4sFP0ttAE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ twine ];
|
nativeBuildInputs = [ twine ];
|
||||||
|
|
|
@ -59,7 +59,7 @@ let
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "numpy";
|
pname = "numpy";
|
||||||
version = "2.2.6";
|
version = "2.3.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
disabled = pythonOlder "3.10";
|
||||||
|
@ -67,7 +67,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "tar.gz";
|
extension = "tar.gz";
|
||||||
hash = "sha256-4pVU4r71SpCqXMB9ps6VWsy4PyGrXeAaYshHiJeyZP0=";
|
hash = "sha256-WB+H+enp2yy6IUFADhYOndZE7iSHiNb5BjbuuP2SYKY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optionals python.hasDistutilsCxxPatch [
|
patches = lib.optionals python.hasDistutilsCxxPatch [
|
||||||
|
@ -122,6 +122,8 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
pushd $out
|
pushd $out
|
||||||
|
# For numpy-config executable to be available during tests
|
||||||
|
export PATH=$PATH:$out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postCheck = ''
|
postCheck = ''
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
{
|
{
|
||||||
argcomplete,
|
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
setuptools,
|
||||||
installShellFiles,
|
installShellFiles,
|
||||||
|
argcomplete,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
p7zip,
|
p7zip,
|
||||||
cabextract,
|
cabextract,
|
||||||
|
@ -40,7 +41,7 @@ let
|
||||||
in
|
in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "patool";
|
pname = "patool";
|
||||||
version = "3.1.0";
|
version = "4.0.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
#pypi doesn't have test data
|
#pypi doesn't have test data
|
||||||
|
@ -48,17 +49,12 @@ buildPythonPackage rec {
|
||||||
owner = "wummel";
|
owner = "wummel";
|
||||||
repo = "patool";
|
repo = "patool";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk=";
|
hash = "sha256-KAOJi8vUP9kPa++dLEXf3mwrv1kmV7uDZmtvngPxQ90=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://github.com/wummel/patool/pull/173
|
|
||||||
./fix-rar-detection.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace patoolib/util.py \
|
substituteInPlace patoolib/util.py \
|
||||||
--replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"'
|
--replace-fail 'path = os.environ.get("PATH", os.defpath)' 'path = os.environ.get("PATH", os.defpath) + ":${lib.makeBinPath compression-utilities}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||||
|
@ -68,9 +64,7 @@ buildPythonPackage rec {
|
||||||
--zsh <(${argcomplete}/bin/register-python-argcomplete -s zsh $out/bin/patool)
|
--zsh <(${argcomplete}/bin/register-python-argcomplete -s zsh $out/bin/patool)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
installShellFiles
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities;
|
nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities;
|
||||||
|
|
||||||
|
@ -85,11 +79,11 @@ buildPythonPackage rec {
|
||||||
"test_p7azip"
|
"test_p7azip"
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "portable archive file manager";
|
description = "portable archive file manager";
|
||||||
mainProgram = "patool";
|
mainProgram = "patool";
|
||||||
homepage = "https://wummel.github.io/patool/";
|
homepage = "https://wummel.github.io/patool/";
|
||||||
license = licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
maintainers = with maintainers; [ marius851000 ];
|
maintainers = with lib.maintainers; [ marius851000 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pycron";
|
pname = "pycron";
|
||||||
version = "3.1.2";
|
version = "3.2.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kipe";
|
owner = "kipe";
|
||||||
repo = "pycron";
|
repo = "pycron";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-WnaQfS3VzF9fZHX9eNRjih/U7SgWeWVynLdwPZgF950=";
|
hash = "sha256-AuDqElqu/cbTASHQfWM85JHu8DvkwArZ2leMZSB+XVM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
|
|
@ -23,14 +23,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pydmd";
|
pname = "pydmd";
|
||||||
version = "2025.05.01";
|
version = "2025.06.01";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "PyDMD";
|
owner = "PyDMD";
|
||||||
repo = "PyDMD";
|
repo = "PyDMD";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-+ol103I4lrTVvANAK5k6bFfeUWj04YlkAqJUW8cw42Q=";
|
hash = "sha256-u8dW90FZSZaVbPNeILeZyOwAU0WOAeTAMCHpe7n4Bi4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyemvue";
|
pname = "pyemvue";
|
||||||
version = "0.18.8";
|
version = "0.18.9";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-MTVc5bzYMegITeLc3WmP1ctfTXStuOns1IYIFtga/Rk=";
|
hash = "sha256-iHnNR6c/EdKZzqs4zQodfEZ/FMj1j0JRKjktyq/H0o0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ hatchling ];
|
nativeBuildInputs = [ hatchling ];
|
||||||
|
|
|
@ -25,12 +25,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyinstaller";
|
pname = "pyinstaller";
|
||||||
version = "6.13.0";
|
version = "6.14.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-OJEf7sLF4hXlFZp+Zv2xJAAWi9EWFDtUqKejfwhzNFY=";
|
hash = "sha256-zFXNwhSRci10Ez41qzY6iGebN+4tdvnYCty8Cuhi1jA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
@ -16,14 +16,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyopenssl";
|
pname = "pyopenssl";
|
||||||
version = "25.0.0";
|
version = "25.1.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pyca";
|
owner = "pyca";
|
||||||
repo = "pyopenssl";
|
repo = "pyopenssl";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-CQHLEtNb2jX7WNAYlmv5EIgepetMl81Xl3AJuRqOHow=";
|
hash = "sha256-QF511MVyjfddmkTd2H7RNJeoWs+e0me4i55YGP4t910=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
|
|
39
pkgs/development/python-modules/pyprobeplus/default.nix
Normal file
39
pkgs/development/python-modules/pyprobeplus/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{
|
||||||
|
bleak,
|
||||||
|
buildPythonPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
lib,
|
||||||
|
setuptools,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pyprobeplus";
|
||||||
|
version = "1.0.1";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "pantherale0";
|
||||||
|
repo = "pyprobeplus";
|
||||||
|
tag = version;
|
||||||
|
hash = "sha256-ixrkwnvqjHwqnKG3Xo4qJP/FcP7fuAOPKpar13e8U1w=";
|
||||||
|
};
|
||||||
|
|
||||||
|
build-system = [ setuptools ];
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
bleak
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "pyprobeplus" ];
|
||||||
|
|
||||||
|
# upstream has no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
changelog = "https://github.com/pantherale0/pyprobeplus/releases/tag/${src.tag}";
|
||||||
|
description = "Generic library to interact with a Probe Plus BLE device";
|
||||||
|
homepage = "https://github.com/pantherale0/pyprobeplus";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = with lib.maintainers; [ dotlambda ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,9 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
buildPythonPackage,
|
buildPythonPackage,
|
||||||
pythonAtLeast,
|
fetchFromGitHub,
|
||||||
pythonOlder,
|
|
||||||
fetchPypi,
|
|
||||||
pytest,
|
pytest,
|
||||||
pytest-asyncio,
|
pytest-asyncio,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
|
@ -13,14 +11,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytest-mock";
|
pname = "pytest-mock";
|
||||||
version = "3.14.0";
|
version = "3.14.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
src = fetchFromGitHub {
|
||||||
|
owner = "pytest-dev";
|
||||||
src = fetchPypi {
|
repo = "pytest-mock";
|
||||||
inherit pname version;
|
tag = "v${version}";
|
||||||
hash = "sha256-JxklWh7+zq28BW1r8989HFAVUw+0DPNHwPmvrIhBC9A=";
|
hash = "sha256-aOa/MQAgQePX/NivQ6G37r70sZnqBA+y+GXvPVBxmvs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -35,18 +33,12 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = lib.optionals (pythonAtLeast "3.11") [
|
|
||||||
# Regression in 3.11.7 and 3.12.1; https://github.com/pytest-dev/pytest-mock/issues/401
|
|
||||||
"test_failure_message_with_name"
|
|
||||||
"test_failure_message_with_no_name"
|
|
||||||
];
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "pytest_mock" ];
|
pythonImportsCheck = [ "pytest_mock" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Thin wrapper around the mock package for easier use with pytest";
|
description = "Thin wrapper around the mock package for easier use with pytest";
|
||||||
homepage = "https://github.com/pytest-dev/pytest-mock";
|
homepage = "https://github.com/pytest-dev/pytest-mock";
|
||||||
changelog = "https://github.com/pytest-dev/pytest-mock/blob/v${version}/CHANGELOG.rst";
|
changelog = "https://github.com/pytest-dev/pytest-mock/blob/${src.tag}/CHANGELOG.rst";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ dotlambda ];
|
maintainers = with maintainers; [ dotlambda ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,14 +23,14 @@
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "qpsolvers";
|
pname = "qpsolvers";
|
||||||
version = "4.7.0";
|
version = "4.7.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qpsolvers";
|
owner = "qpsolvers";
|
||||||
repo = "qpsolvers";
|
repo = "qpsolvers";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-rHasR2myJjz4DoNWo2wvH11Mxxk/fZ/z9ZdglRcIPX0=";
|
hash = "sha256-sGnr1my1/1xA+pVX1SLsj8WtNViJ/nKRwN6Kl0HsJV0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ flit-core ];
|
build-system = [ flit-core ];
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue