mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-09 16:18:34 +01:00
Compare commits
229 commits
9c5829c398
...
a024bfb866
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a024bfb866 | ||
|
|
841518f70e | ||
|
|
f77d533ed8 | ||
|
|
ea5e9eb09a | ||
|
|
660b26a330 | ||
|
|
5e6858f620 | ||
|
|
69b45022d9 | ||
|
|
00e0caf5d5 | ||
|
|
ba954d89ba | ||
|
|
718fc80bb0 | ||
|
|
f74e70fe49 | ||
|
|
adedcdf454 | ||
|
|
842aeca5c6 | ||
|
|
268853f436 | ||
|
|
08822903bb | ||
|
|
92ebba65e7 | ||
|
|
3ace768a11 | ||
|
|
344ea83a38 | ||
|
|
3045f43481 | ||
|
|
7582029936 | ||
|
|
f780f1f7c7 | ||
|
|
9c69559d66 | ||
|
|
1882101a2c | ||
|
|
95acb919e1 | ||
|
|
aef531a320 | ||
|
|
6add9426ce | ||
|
|
6d582e5f0c | ||
|
|
2709147858 | ||
|
|
c91b81f83d | ||
|
|
5df6bef409 | ||
|
|
15e695a9ea | ||
|
|
a8df035828 | ||
|
|
c59492af9b | ||
|
|
2d81deb21c | ||
|
|
ddb79bdd1e | ||
|
|
9946b8905f | ||
|
|
2966d110ce | ||
|
|
e9fc30ed5d | ||
|
|
c148fa0cf6 | ||
|
|
d78d3d9937 | ||
|
|
b5e7365ef7 | ||
|
|
6ad09e4043 | ||
|
|
f7a507d102 | ||
|
|
0f211302be | ||
|
|
73124802d1 | ||
|
|
b6d0b74816 | ||
|
|
60cd974850 | ||
|
|
b1d47aef41 | ||
|
|
fe2a7f9f1a | ||
|
|
1e894edbc7 | ||
|
|
98df998d3e | ||
|
|
663028e7ed | ||
|
|
a65655104f | ||
|
|
6c8850d1e1 | ||
|
|
7663f1c46c | ||
|
|
dbc2252f27 | ||
|
|
069d4d63b9 | ||
|
|
5a3b0dc7ea | ||
|
|
a967f003bd | ||
|
|
16508bedc4 | ||
|
|
dc28a0b47e | ||
|
|
f4de2b7d91 | ||
|
|
be4be0370f | ||
|
|
52f25dd8c8 | ||
|
|
bef012bee6 | ||
|
|
ed43fc2b34 | ||
|
|
0a9b910a0d | ||
|
|
91215bd1e3 | ||
|
|
73a427b2c7 | ||
|
|
f834fc0512 | ||
|
|
4730c5d403 | ||
|
|
1f31b6d00c | ||
|
|
d482450035 | ||
|
|
288df07b3d | ||
|
|
2a629a5724 | ||
|
|
ee4ee231fc | ||
|
|
c11e966070 | ||
|
|
d1911335cc | ||
|
|
fb8e1da05b | ||
|
|
f9908540b1 | ||
|
|
92c37f09b3 | ||
|
|
214c58cf94 | ||
|
|
2081f54d4d | ||
|
|
6000ef24ec | ||
|
|
7cc7b75351 | ||
|
|
ac6627f9d5 | ||
|
|
5aaef58da7 | ||
|
|
0025296a0c | ||
|
|
9b3d4d52ac | ||
|
|
da03bcff09 | ||
|
|
713fb40904 | ||
|
|
69492fc4d1 | ||
|
|
227d50bcf2 | ||
|
|
6c87fae87d | ||
|
|
30b1f35f98 | ||
|
|
c4c2f7257d | ||
|
|
dd439a450a | ||
|
|
4adc1681ef | ||
|
|
92130b57b3 | ||
|
|
67641f75c3 | ||
|
|
c97cb7ab84 | ||
|
|
4ef02d8810 | ||
|
|
9e596e515d | ||
|
|
fb15646b0d | ||
|
|
39c2e4dfa2 | ||
|
|
e3ec49818f | ||
|
|
f1c6b62e5c | ||
|
|
de3b605591 | ||
|
|
2d401e94bf | ||
|
|
3e7615cdc2 | ||
|
|
84c49e758c | ||
|
|
52696ff186 | ||
|
|
964c358544 | ||
|
|
44e2c35cbd | ||
|
|
ad5e941395 | ||
|
|
a4f1c91d19 | ||
|
|
108a1edee4 | ||
|
|
3abbd64627 | ||
|
|
b941b4368f | ||
|
|
dd23aca5d0 | ||
|
|
95ae2ac138 | ||
|
|
888d34ddab | ||
|
|
4c05d5ce9d | ||
|
|
5f42e29bd5 | ||
|
|
85677d4fd8 | ||
|
|
f32f9f4986 | ||
|
|
34247b4e3c | ||
|
|
d09aa3bc26 | ||
|
|
de16317b4b | ||
|
|
3f91547e46 | ||
|
|
2a5661fe78 | ||
|
|
b8ca22dc7a | ||
|
|
0aa851869e | ||
|
|
f34c8dc1af | ||
|
|
2ce1f99575 | ||
|
|
206fd45dcc | ||
|
|
e317c4d283 | ||
|
|
bb2e2e26e9 | ||
|
|
e1604ac228 | ||
|
|
28f11e5316 | ||
|
|
5708ecc352 | ||
|
|
1478dc2ae2 | ||
|
|
f9d65f372b | ||
|
|
2e80303fbb | ||
|
|
71139c6cc0 | ||
|
|
83928d8a19 | ||
|
|
a77aa2b0c1 | ||
|
|
6bc521cbc0 | ||
|
|
d07a7548f6 | ||
|
|
ee911c1f6a | ||
|
|
368a919d92 | ||
|
|
4a0ac9806f | ||
|
|
35bbdb2811 | ||
|
|
3901ded5d6 | ||
|
|
f2f501c50c | ||
|
|
6557f66294 | ||
|
|
17b131092d | ||
|
|
0c5e72e937 | ||
|
|
6e20cb326c | ||
|
|
841fb3a98c | ||
|
|
2186163629 | ||
|
|
3137ea1628 | ||
|
|
2378436845 | ||
|
|
dc84194c7f | ||
|
|
1690f91c4c | ||
|
|
27d375fe0c | ||
|
|
2f72afeaad | ||
|
|
7e0359f671 | ||
|
|
55fd45273a | ||
|
|
559becaabf | ||
|
|
19751496f4 | ||
|
|
971d873fd2 | ||
|
|
0334adbf01 | ||
|
|
aaaa9a468d | ||
|
|
006a6b82db | ||
|
|
5ff1655c9e | ||
|
|
0ea279e22f | ||
|
|
ffe7af76eb | ||
|
|
88e4f87dbd | ||
|
|
c837886460 | ||
|
|
f646b17f1d | ||
|
|
f428216cda | ||
|
|
2f3e3c587c | ||
|
|
13db03d019 | ||
|
|
9580e43fd1 | ||
|
|
bd04ef83ce | ||
|
|
689e6ac84a | ||
|
|
159a5ae316 | ||
|
|
0fe76d21bd | ||
|
|
f720bb2492 | ||
|
|
3cae4c787d | ||
|
|
eaf47e2fec | ||
|
|
0416c521c9 | ||
|
|
089ac45d32 | ||
|
|
f847b7a54b | ||
|
|
5049f48dfa | ||
|
|
569f707da6 | ||
|
|
1245c5754e | ||
|
|
5c56e48ae0 | ||
|
|
a783a81473 | ||
|
|
d7c400085f | ||
|
|
e4d31bd6c5 | ||
|
|
eae6d48574 | ||
|
|
e86da03626 | ||
|
|
e0472106fd | ||
|
|
96b912fcc0 | ||
|
|
59e76717ea | ||
|
|
598a65ae09 | ||
|
|
b4634379d3 | ||
|
|
fc390ff82d | ||
|
|
15986ca7ea | ||
|
|
c5f9fa052a | ||
|
|
2b4c4d16a0 | ||
|
|
8c2d3efebd | ||
|
|
1af1e23427 | ||
|
|
b349beae2a | ||
|
|
e4ff028cb8 | ||
|
|
7d77e5b064 | ||
|
|
c98e04fffc | ||
|
|
4e3eb5a44f | ||
|
|
f05f1abb5e | ||
|
|
5fa5ca491f | ||
|
|
3d52f4bb4a | ||
|
|
0fd6f799b9 | ||
|
|
71a478fb6e | ||
|
|
f31fad47e8 | ||
|
|
86710a779c | ||
|
|
3265b95424 | ||
|
|
458507324d |
|
|
@ -27146,6 +27146,11 @@
|
||||||
githubId = 120451;
|
githubId = 120451;
|
||||||
name = "Urban Skudnik";
|
name = "Urban Skudnik";
|
||||||
};
|
};
|
||||||
|
usovalx = {
|
||||||
|
name = "Oleksandr Usov";
|
||||||
|
github = "usovalx";
|
||||||
|
githubId = 1041626;
|
||||||
|
};
|
||||||
usrfriendly = {
|
usrfriendly = {
|
||||||
name = "Arin Lares";
|
name = "Arin Lares";
|
||||||
email = "arinlares@gmail.com";
|
email = "arinlares@gmail.com";
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@ in
|
||||||
add_header Cache-Control "public";
|
add_header Cache-Control "public";
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = {
|
"~ ^/.*-([A-Za-z0-9]+)\\.webmanifest$" = {
|
||||||
root = cfg.package.web;
|
root = cfg.package.web;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
access_log off;
|
access_log off;
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,11 @@ in
|
||||||
xserver.windowManager.qtile.finalPackage = cfg.package.override {
|
xserver.windowManager.qtile.finalPackage = cfg.package.override {
|
||||||
extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs;
|
extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
displayManager.sessionPackages = [ cfg.finalPackage ];
|
displayManager.sessionPackages = [ cfg.finalPackage ];
|
||||||
|
|
||||||
|
# Recommended by upstream for libqtile/widget/imapwidget.py
|
||||||
|
gnome.gnome-keyring.enable = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
|
|
|
||||||
|
|
@ -818,7 +818,10 @@ in
|
||||||
ksm = runTest ./ksm.nix;
|
ksm = runTest ./ksm.nix;
|
||||||
kthxbye = runTest ./kthxbye.nix;
|
kthxbye = runTest ./kthxbye.nix;
|
||||||
kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
|
kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
|
||||||
kubo = import ./kubo { inherit runTest; };
|
kubo = import ./kubo {
|
||||||
|
inherit runTest;
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
};
|
||||||
lact = runTest ./lact.nix;
|
lact = runTest ./lact.nix;
|
||||||
ladybird = runTest ./ladybird.nix;
|
ladybird = runTest ./ladybird.nix;
|
||||||
languagetool = runTest ./languagetool.nix;
|
languagetool = runTest ./languagetool.nix;
|
||||||
|
|
@ -963,7 +966,10 @@ in
|
||||||
mopidy = runTest ./mopidy.nix;
|
mopidy = runTest ./mopidy.nix;
|
||||||
morph-browser = runTest ./morph-browser.nix;
|
morph-browser = runTest ./morph-browser.nix;
|
||||||
mosquitto = runTest ./mosquitto.nix;
|
mosquitto = runTest ./mosquitto.nix;
|
||||||
movim = import ./web-apps/movim { inherit runTest; };
|
movim = import ./web-apps/movim {
|
||||||
|
inherit runTest;
|
||||||
|
inherit (pkgs) lib;
|
||||||
|
};
|
||||||
mpd = runTest ./mpd.nix;
|
mpd = runTest ./mpd.nix;
|
||||||
mpv = runTest ./mpv.nix;
|
mpv = runTest ./mpv.nix;
|
||||||
mtp = runTest ./mtp.nix;
|
mtp = runTest ./mtp.nix;
|
||||||
|
|
|
||||||
|
|
@ -148,10 +148,9 @@ in
|
||||||
machine.wait_for_text("Albums")
|
machine.wait_for_text("Albums")
|
||||||
machine.succeed("xdotool mousemove 25 45 click 1") # Open categories
|
machine.succeed("xdotool mousemove 25 45 click 1") # Open categories
|
||||||
machine.sleep(2)
|
machine.sleep(2)
|
||||||
machine.wait_for_text("Tracks")
|
|
||||||
machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category
|
machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category
|
||||||
machine.sleep(2)
|
machine.sleep(2)
|
||||||
machine.wait_for_text("${musicFileName}") # the test file
|
machine.wait_for_text("Tracks") # Written in larger text now, easier for OCR
|
||||||
machine.screenshot("lomiri-music_listing")
|
machine.screenshot("lomiri-music_listing")
|
||||||
|
|
||||||
# Ensure pause colours isn't present already
|
# Ensure pause colours isn't present already
|
||||||
|
|
@ -180,8 +179,9 @@ in
|
||||||
|
|
||||||
machine.screenshot("lomiri-music_paused")
|
machine.screenshot("lomiri-music_paused")
|
||||||
|
|
||||||
# Lastly, check if generated cover image got extracted properly
|
# Lastly, check if song details like title & generated cover image got extracted properly
|
||||||
# if not, indicates an issue with mediascanner / lomiri-thumbnailer
|
# if not, indicates an issue with mediascanner / lomiri-thumbnailer
|
||||||
|
machine.wait_for_text("${musicFileName}")
|
||||||
machine.wait_for_text("${ocrContent}")
|
machine.wait_for_text("${ocrContent}")
|
||||||
|
|
||||||
machine.succeed("pkill -f lomiri-music-app")
|
machine.succeed("pkill -f lomiri-music-app")
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@
|
||||||
start_all()
|
start_all()
|
||||||
machine.wait_for_unit("nix-daemon.socket")
|
machine.wait_for_unit("nix-daemon.socket")
|
||||||
# regression test for the workaround for https://github.com/NixOS/nix/issues/9487
|
# regression test for the workaround for https://github.com/NixOS/nix/issues/9487
|
||||||
print(machine.succeed("nix-instantiate --find-file extra"))
|
# unset NIX_PATH because environtment overrides the config
|
||||||
print(machine.succeed("nix-instantiate --find-file nonextra"))
|
print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file extra"))
|
||||||
|
print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file nonextra"))
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -204,11 +204,6 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
series_2_2 = makeZfsTest {
|
|
||||||
zfsPackage = pkgs.zfs_2_2;
|
|
||||||
kernelPackages = pkgs.linuxPackages;
|
|
||||||
};
|
|
||||||
|
|
||||||
series_2_3 = makeZfsTest {
|
series_2_3 = makeZfsTest {
|
||||||
zfsPackage = pkgs.zfs_2_3;
|
zfsPackage = pkgs.zfs_2_3;
|
||||||
kernelPackages = pkgs.linuxPackages;
|
kernelPackages = pkgs.linuxPackages;
|
||||||
|
|
|
||||||
|
|
@ -70,17 +70,28 @@ mkDerivation rec {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [ "-DWANT_QT5=ON" ];
|
prePatch = ''
|
||||||
|
# Update CMake minimum required version and policies
|
||||||
|
substituteInPlace CMakeLists.txt --replace 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'
|
||||||
|
substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0026 OLD)' 'CMAKE_POLICY(SET CMP0026 NEW)'
|
||||||
|
substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0050 OLD)' 'CMAKE_POLICY(SET CMP0050 NEW)'
|
||||||
|
substituteInPlace CMakeLists.txt --replace 'GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)' 'SET(BIN2RES $<TARGET_FILE:bin2res>)'
|
||||||
|
'';
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DWANT_QT5=ON"
|
||||||
|
]
|
||||||
|
++ lib.optionals (lib.versionOlder version "11.4") [
|
||||||
|
# Fix the build with CMake 4.
|
||||||
|
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "DAW similar to FL Studio (music production software)";
|
description = "DAW similar to FL Studio (music production software)";
|
||||||
mainProgram = "lmms";
|
mainProgram = "lmms";
|
||||||
homepage = "https://lmms.io";
|
homepage = "https://lmms.io";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = [
|
platforms = platforms.linux;
|
||||||
"x86_64-linux"
|
|
||||||
"i686-linux"
|
|
||||||
];
|
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||||
name = "harper";
|
name = "harper";
|
||||||
publisher = "elijah-potter";
|
publisher = "elijah-potter";
|
||||||
version = harper.version;
|
version = harper.version;
|
||||||
hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";
|
hash = "sha256-ldXQKAJX8YQVjtGjKRom14fNuA6ZwDwpPusbjS+4G+I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "latex-workshop";
|
name = "latex-workshop";
|
||||||
publisher = "James-Yu";
|
publisher = "James-Yu";
|
||||||
version = "10.10.2";
|
version = "10.11.2";
|
||||||
hash = "sha256-Ls02bUSh5O5mDT2SEnaibvpHw535yelv5NaQ/NRM13k=";
|
hash = "sha256-+vlOfTCsYLqN9fxxdLyHs0Cn7Lwcj4Is2L1SwqIFcJI=";
|
||||||
};
|
};
|
||||||
meta = {
|
meta = {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||||
|
|
|
||||||
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "helm-diff";
|
pname = "helm-diff";
|
||||||
version = "3.13.1";
|
version = "3.13.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "databus23";
|
owner = "databus23";
|
||||||
repo = "helm-diff";
|
repo = "helm-diff";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-7LkXoPhLqZtc1jy8JOkZrHWSIqB2oZLHsEyeNk3vl60=";
|
hash = "sha256-Oqcc+MYb8zMAIJFQ1UcneXYzOvMQdelwloEGl3+zyBs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-QSbml6M+ftQy4n+ybYWf2gCsbVmrnhX09w3ffW/JgUM=";
|
vendorHash = "sha256-URmWHYVMJWzRJlORYpcGvb2KkVfsJip3Q354u8179Bo=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
|
|
|
||||||
|
|
@ -145,20 +145,20 @@
|
||||||
"vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
|
"vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
|
||||||
},
|
},
|
||||||
"checkly_checkly": {
|
"checkly_checkly": {
|
||||||
"hash": "sha256-UfaiZe5qSbnoyoYx1E1yXG8cQyBbG+wbJiBXR7jm0bE=",
|
"hash": "sha256-V5k+UdniG7v8obDXAtvRxTHgJa4I9rbjDsG/QrCxYTo=",
|
||||||
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
|
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
|
||||||
"owner": "checkly",
|
"owner": "checkly",
|
||||||
"repo": "terraform-provider-checkly",
|
"repo": "terraform-provider-checkly",
|
||||||
"rev": "v1.15.0",
|
"rev": "v1.16.0",
|
||||||
"spdx": null,
|
"spdx": null,
|
||||||
"vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0="
|
"vendorHash": "sha256-E0XnwBMCfyP6sbBFkh+ulNa3fSaAGa5lSUD/PIfKvhE="
|
||||||
},
|
},
|
||||||
"ciscodevnet_aci": {
|
"ciscodevnet_aci": {
|
||||||
"hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=",
|
"hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=",
|
||||||
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
|
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
|
||||||
"owner": "CiscoDevNet",
|
"owner": "CiscoDevNet",
|
||||||
"repo": "terraform-provider-aci",
|
"repo": "terraform-provider-aci",
|
||||||
"rev": "v2.17.0",
|
"rev": "v2.18.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": null
|
"vendorHash": null
|
||||||
},
|
},
|
||||||
|
|
@ -498,13 +498,13 @@
|
||||||
"vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
|
"vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
|
||||||
},
|
},
|
||||||
"hashicorp_awscc": {
|
"hashicorp_awscc": {
|
||||||
"hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",
|
"hash": "sha256-eaFzTQehn1nIq0Zl/8r2AtmPQnhh7X44q/6JVzIzX2A=",
|
||||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"repo": "terraform-provider-awscc",
|
"repo": "terraform-provider-awscc",
|
||||||
"rev": "v1.62.0",
|
"rev": "v1.63.0",
|
||||||
"spdx": "MPL-2.0",
|
"spdx": "MPL-2.0",
|
||||||
"vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="
|
"vendorHash": "sha256-wP7A2k0sXfbfQjKkDx+rOC8vgBhSQXak3gdera8inzY="
|
||||||
},
|
},
|
||||||
"hashicorp_azuread": {
|
"hashicorp_azuread": {
|
||||||
"hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
|
"hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
|
||||||
|
|
|
||||||
|
|
@ -185,6 +185,12 @@ let
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 3.0.0)" \
|
||||||
|
"cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
hdf5
|
hdf5
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ buildNpmPackage {
|
||||||
inherit version src;
|
inherit version src;
|
||||||
sourceRoot = "${src.name}/coolercontrol-ui";
|
sourceRoot = "${src.name}/coolercontrol-ui";
|
||||||
|
|
||||||
npmDepsHash = "sha256-MhMHo6wjkaSCyevwzAKCvSsJTmAq9rYFG1ZVUAkRc0Y=";
|
npmDepsHash = "sha256-pXK2wyRujUqnRZNIf/bDXpYdfEYHeia/E/jwLkfWwfo=";
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
cp -r dist $out
|
cp -r dist $out
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
|
||||||
inherit version src;
|
inherit version src;
|
||||||
sourceRoot = "${src.name}/coolercontrold";
|
sourceRoot = "${src.name}/coolercontrold";
|
||||||
|
|
||||||
cargoHash = "sha256-4aSEEBtxwTyAx5CPa2fDBhx5U+Ql2X/tKPQHLIsm3I0=";
|
cargoHash = "sha256-teKMz6ruTSwQ76dMXoupS3D7n1ashfHPpxMGo3Qm6FI=";
|
||||||
|
|
||||||
buildInputs = [ libdrm ];
|
buildInputs = [ libdrm ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,13 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.0.1";
|
version = "3.0.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "coolercontrol";
|
owner = "coolercontrol";
|
||||||
repo = "coolercontrol";
|
repo = "coolercontrol";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-PvEj3xYJVpHNfd5p7kyw+eW9S/g1FB/YiFgWEJDDbus=";
|
hash = "sha256-puWnnNc3T/R+vPp3oyxP2aTHo1rZ5RWyW6KF6wywF1I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@
|
||||||
}:
|
}:
|
||||||
mkHyprlandPlugin (finalAttrs: {
|
mkHyprlandPlugin (finalAttrs: {
|
||||||
pluginName = "hyprsplit";
|
pluginName = "hyprsplit";
|
||||||
version = "0.51.1";
|
version = "0.52.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shezdy";
|
owner = "shezdy";
|
||||||
repo = "hyprsplit";
|
repo = "hyprsplit";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-7cnfq7fXgJHkmHyvRwx8UsUdUwUEN4A1vUGgsSb4SmI=";
|
hash = "sha256-XlOZr7BKii0ch24ZtOqjeVl1+uGewW5XQTSteKxXg9c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
cmake,
|
cmake,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchMavenArtifact,
|
fetchMavenArtifact,
|
||||||
|
fixDarwinDylibNames,
|
||||||
jdk11,
|
jdk11,
|
||||||
lib,
|
lib,
|
||||||
libbsd,
|
libbsd,
|
||||||
|
|
@ -54,11 +55,16 @@ stdenv.mkDerivation {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoPatchelfHook
|
|
||||||
cmake
|
cmake
|
||||||
jdk11
|
jdk11
|
||||||
makeWrapper
|
makeWrapper
|
||||||
patchelf
|
patchelf
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.isLinux [
|
||||||
|
autoPatchelfHook
|
||||||
|
]
|
||||||
|
++ lib.optionals stdenv.isDarwin [
|
||||||
|
fixDarwinDylibNames
|
||||||
];
|
];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
|
@ -113,6 +119,12 @@ stdenv.mkDerivation {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
|
for lib in $out/lib/*.dylib; do
|
||||||
|
install_name_tool -change "@rpath/$(basename $lib)" "$lib" "$out/bin/aeronmd"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Aeron Messaging C++ Library";
|
description = "Aeron Messaging C++ Library";
|
||||||
homepage = "https://aeron.io/";
|
homepage = "https://aeron.io/";
|
||||||
|
|
|
||||||
|
|
@ -20,14 +20,14 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.2";
|
version = "3.4";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = "apostrophe";
|
repo = "apostrophe";
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ=";
|
hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
reveal-js = fetchFromGitHub {
|
reveal-js = fetchFromGitHub {
|
||||||
|
|
@ -87,6 +87,7 @@ python312Packages.buildPythonApplication {
|
||||||
pypandoc
|
pypandoc
|
||||||
chardet
|
chardet
|
||||||
levenshtein
|
levenshtein
|
||||||
|
regex
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
|
||||||
|
|
@ -24,15 +24,15 @@ index 3777ac98a..07ff17009 100644
|
||||||
install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
|
install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
|
||||||
endif()
|
endif()
|
||||||
diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
|
diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
|
||||||
index 39c339428..dafb58c66 100644
|
index 7b594bb4a..18e886fe7 100644
|
||||||
--- a/ruby/cmake/os-macos.cmake
|
--- a/ruby/cmake/os-macos.cmake
|
||||||
+++ b/ruby/cmake/os-macos.cmake
|
+++ b/ruby/cmake/os-macos.cmake
|
||||||
@@ -43,7 +43,7 @@ target_link_libraries(
|
@@ -41,7 +41,7 @@ target_link_libraries(
|
||||||
|
)
|
||||||
|
|
||||||
if(SDL_FOUND)
|
if(SDL_FOUND)
|
||||||
target_link_libraries(
|
- target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>")
|
||||||
ruby
|
+ target_link_libraries(ruby PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>")
|
||||||
- PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
|
|
||||||
+ PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(librashader_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
apple-sdk_14,
|
apple-sdk_14,
|
||||||
cmake,
|
cmake,
|
||||||
fetchFromGitHub,
|
fetchzip,
|
||||||
gtk3,
|
gtk3,
|
||||||
gtksourceview3,
|
gtksourceview3,
|
||||||
libGL,
|
libGL,
|
||||||
|
|
@ -29,13 +29,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "ares";
|
pname = "ares";
|
||||||
version = "145";
|
version = "146";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchzip {
|
||||||
owner = "ares-emulator";
|
url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz";
|
||||||
repo = "ares";
|
hash = "sha256-D4N0u9NNlhs4nMoUrAY+sg6Ybt1xQPMiH1u0cV0Qixs=";
|
||||||
tag = "v${finalAttrs.version}";
|
stripRoot = false;
|
||||||
hash = "sha256-es+K5+qlK7FcJCFEIMcOsXCZSnoXEEmtS0yhpCvaILM";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -80,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "ARES_BUILD_LOCAL" false)
|
(lib.cmakeBool "ARES_BUILD_LOCAL" false)
|
||||||
(lib.cmakeBool "ARES_SKIP_DEPS" true)
|
(lib.cmakeBool "ARES_SKIP_DEPS" true)
|
||||||
|
(lib.cmakeBool "ARES_BUILD_OFFICIAL" true)
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
|
|
|
||||||
|
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "bashunit";
|
pname = "bashunit";
|
||||||
version = "0.25.0";
|
version = "0.26.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TypedDevs";
|
owner = "TypedDevs";
|
||||||
repo = "bashunit";
|
repo = "bashunit";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
|
hash = "sha256-cZ2fcm4OxA3Ly8QRkOQSjaSZW80/Pu2z10+iN4pDFOs=";
|
||||||
forceFetchGit = true; # needed to include the tests directory for the check phase
|
forceFetchGit = true; # needed to include the tests directory for the check phase
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,14 +24,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "biblioteca";
|
pname = "biblioteca";
|
||||||
version = "1.6";
|
version = "1.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "workbenchdev";
|
owner = "workbenchdev";
|
||||||
repo = "Biblioteca";
|
repo = "Biblioteca";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI=";
|
hash = "sha256-PRm/4t0f8AExOFXCcV7S+JIKkJgYP1gego2xTUbj7FY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
blueprint-compiler
|
||||||
desktop-file-utils
|
desktop-file-utils
|
||||||
makeShellWrapper
|
makeShellWrapper
|
||||||
gjs
|
gjs
|
||||||
|
|
@ -70,9 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/meson.build \
|
|
||||||
--replace-fail "/app/bin/blueprint-compiler" "${lib.getExe blueprint-compiler}" \
|
|
||||||
|
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
|
||||||
substituteInPlace build-aux/build-index.js \
|
substituteInPlace build-aux/build-index.js \
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,20 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2025.10.1";
|
version = "2025.10.3";
|
||||||
|
|
||||||
product =
|
product =
|
||||||
if proEdition then
|
if proEdition then
|
||||||
{
|
{
|
||||||
productName = "pro";
|
productName = "pro";
|
||||||
productDesktop = "Burp Suite Professional Edition";
|
productDesktop = "Burp Suite Professional Edition";
|
||||||
hash = "sha256-aLP8jVHuKmp4yzcd1KsgidAhWUxoJo0beGwq/6I4n4A=";
|
hash = "sha256-4XGIFjklYfHBJ/HIdJ7C1eTpLAq0nC3VSP6O/R3tdJw=";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
productName = "community";
|
productName = "community";
|
||||||
productDesktop = "Burp Suite Community Edition";
|
productDesktop = "Burp Suite Community Edition";
|
||||||
hash = "sha256-HiYdJrnTg0HkCt+lXKkhfGawp/NZQmhH4sGytlpiLU8=";
|
hash = "sha256-28dsTC0AEHT6IO9he1Rc3xglnf8epdXJitZ1BdCLrYE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
|
|
||||||
|
|
@ -4,17 +4,16 @@ set -eu -o pipefail
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
|
||||||
|
|
||||||
curl -s 'https://portswigger.net/burp/releases/data' |
|
curl -s 'https://portswigger.net/burp/releases/data' | jq -r '
|
||||||
jq -r '
|
def verarr: (.Version // "") | split(".") | map(tonumber? // 0);
|
||||||
[[
|
[ .ResultSet.Results[]
|
||||||
.ResultSet.Results[]
|
| select((.categories|sort) == (["Professional","Community"]|sort))
|
||||||
| select(
|
| .builds[]
|
||||||
(.categories | sort) == (["Professional","Community"] | sort)
|
| select(.ProductPlatform == "Jar")
|
||||||
and .releaseChannels == ["Early Adopter"]
|
] as $all
|
||||||
)
|
| ($all | max_by( (.Version // "") | split(".") | map(tonumber? // 0) ) | .Version) as $v
|
||||||
][0].builds[]
|
| $all | map(select(.Version == $v))
|
||||||
| select(.ProductPlatform == "Jar")
|
' > latest.json
|
||||||
]' >latest.json
|
|
||||||
|
|
||||||
version=$(jq -r '.[0].Version' latest.json)
|
version=$(jq -r '.[0].Version' latest.json)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "circup";
|
pname = "circup";
|
||||||
version = "2.1.2";
|
version = "2.3.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "adafruit";
|
owner = "adafruit";
|
||||||
repo = "circup";
|
repo = "circup";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-lmuxqkZVByJwnfHj4yljWQwTvdLnguq3hZm6a7LN6Xo=";
|
hash = "sha256-o42gzdv69+BO5kTconZaMQBv89GzuFprf/UoZjF29oI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [ "semver" ];
|
pythonRelaxDeps = [ "semver" ];
|
||||||
|
|
@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# Test requires network access
|
# Test requires network access
|
||||||
"test_libraries_from_imports_bad"
|
"test_libraries_from_imports_bad"
|
||||||
|
"test_install_auto_file_bad"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
--- a/Cargo.lock
|
--- a/Cargo.lock
|
||||||
+++ b/Cargo.lock
|
+++ b/Cargo.lock
|
||||||
@@ -1250,7 +1250,7 @@
|
@@ -1249,7 +1249,7 @@
|
||||||
"sha2",
|
"sha2",
|
||||||
"shadowquic",
|
"shadowquic",
|
||||||
"shadowsocks",
|
"shadowsocks",
|
||||||
- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
|
- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
|
||||||
+ "smoltcp 0.12.0",
|
+ "smoltcp",
|
||||||
"socket2 0.6.0",
|
"sock2proc",
|
||||||
|
"socket2 0.6.1",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"thiserror 2.0.17",
|
@@ -4234,7 +4234,7 @@
|
||||||
@@ -4096,7 +4096,7 @@
|
|
||||||
"etherparse 0.16.0",
|
"etherparse 0.16.0",
|
||||||
"futures",
|
"futures",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
+ "smoltcp 0.12.0",
|
+ "smoltcp",
|
||||||
"spin 0.9.8",
|
"spin 0.9.8",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
@@ -6487,20 +6487,6 @@
|
@@ -6632,20 +6632,6 @@
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -36,15 +36,15 @@
|
||||||
-]
|
-]
|
||||||
-
|
-
|
||||||
-[[package]]
|
-[[package]]
|
||||||
name = "socket2"
|
name = "sock2proc"
|
||||||
version = "0.4.10"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/Watfaq/sock2proc.git?rev=1097e6b#1097e6ba692025f80567446e0035af1222f5231f"
|
||||||
@@ -8792,7 +8778,7 @@
|
@@ -8964,7 +8950,7 @@
|
||||||
"netstack-lwip",
|
"netstack-lwip",
|
||||||
"netstack-smoltcp",
|
"netstack-smoltcp",
|
||||||
"rand 0.9.2",
|
"rand 0.9.2",
|
||||||
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
+ "smoltcp 0.12.0",
|
+ "smoltcp",
|
||||||
"socket2 0.6.0",
|
"socket2 0.6.1",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
|
|
||||||
|
|
@ -10,16 +10,16 @@
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "clash-rs";
|
pname = "clash-rs";
|
||||||
version = "0.9.1";
|
version = "0.9.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Watfaq";
|
owner = "Watfaq";
|
||||||
repo = "clash-rs";
|
repo = "clash-rs";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-asD7veAYdIF5biCbSXYvAyW/qBra3tvON9TQYCw6nB8=";
|
hash = "sha256-FFbRopIaAOpfb+Wbj+EUXRr89EQE108h8OMn+fpL+ew=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-9zCQKxkjiskkBGxfnq2ANpqWobs+UJ5qCsbME2Z7GY4=";
|
cargoHash = "sha256-JYvITscH1K6xLE6XZpMrEFZWcbue7x7xuPxVQW/Vjb0=";
|
||||||
|
|
||||||
cargoPatches = [ ./Cargo.patch ];
|
cargoPatches = [ ./Cargo.patch ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,17 +7,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "codebook";
|
pname = "codebook";
|
||||||
version = "0.3.16";
|
version = "0.3.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "blopker";
|
owner = "blopker";
|
||||||
repo = "codebook";
|
repo = "codebook";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o=";
|
hash = "sha256-5LTblBxYuz/ErESSLPZ4EHlLID8XvhCDQkKxUyEWcmM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildAndTestSubdir = "crates/codebook-lsp";
|
buildAndTestSubdir = "crates/codebook-lsp";
|
||||||
cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E=";
|
cargoHash = "sha256-jkYtXrNJTaxrAWpB7ZYsj/LA2tUWVReAnF2cb4TpwE0=";
|
||||||
|
|
||||||
# Integration tests require internet access for dictionaries
|
# Integration tests require internet access for dictionaries
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
||||||
|
|
@ -15,15 +15,6 @@ let
|
||||||
|
|
||||||
channels = {
|
channels = {
|
||||||
stable = {
|
stable = {
|
||||||
version = "2.26.3";
|
|
||||||
hash = {
|
|
||||||
x86_64-linux = "sha256-CqV3fCx3TtMLFjzo0Y7/vpAgXyOLABiFyqS8N5pA6xc=";
|
|
||||||
x86_64-darwin = "sha256-PDPU3k1Bao5ibLFx3Zjbh1xsxSpJWUOOHuRbuwMmYDg=";
|
|
||||||
aarch64-linux = "sha256-iq9LPHK6wPSdDRQqWRPr7OfN/HoESIIkOxf9luRS9ck=";
|
|
||||||
aarch64-darwin = "sha256-n+jUocq1MaDRe14gibeA+ujLoGcSCdKQ58wihcTmdlI=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
mainline = {
|
|
||||||
version = "2.27.3";
|
version = "2.27.3";
|
||||||
hash = {
|
hash = {
|
||||||
x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA=";
|
x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA=";
|
||||||
|
|
@ -32,6 +23,15 @@ let
|
||||||
aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI=";
|
aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
mainline = {
|
||||||
|
version = "2.28.0";
|
||||||
|
hash = {
|
||||||
|
x86_64-linux = "sha256-Z56Q5ETE3wpBJPIaZ9/qgAJ8Tj67L1ScDwuAk0Ijjkc=";
|
||||||
|
x86_64-darwin = "sha256-tydx9Q32TvPF36+meoQ+NBQ7MXUHRPHBI4L7UNBhXQ0=";
|
||||||
|
aarch64-linux = "sha256-x7WErWe3p6Cdr2moKG0X/DEY+dkeMhnaG2RUNWfyoQU=";
|
||||||
|
aarch64-darwin = "sha256-jVK599hDIhWy0HOhJmPevhnZnYLylxmZ59rhrOSRGIU=";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ buildGoModule (finalAttrs: {
|
||||||
diff -u plugin.cfg.orig plugin.cfg || true
|
diff -u plugin.cfg.orig plugin.cfg || true
|
||||||
for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
|
for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
|
||||||
GOOS= GOARCH= go generate
|
GOOS= GOARCH= go generate
|
||||||
|
go mod tidy
|
||||||
go mod vendor
|
go mod vendor
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "cwltool";
|
pname = "cwltool";
|
||||||
version = "3.1.20250925164626";
|
version = "3.1.20251031082601";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "common-workflow-language";
|
owner = "common-workflow-language";
|
||||||
repo = "cwltool";
|
repo = "cwltool";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-esY/p7wm0HvLiX+jZENBye4NblYveYAXevYRQxk+u44=";
|
hash = "sha256-avRNOdL4Ig2cYQWh8SqX/KWfgXyVg0TVfVFrlqzUCLA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,18 @@
|
||||||
|
|
||||||
# empty means build all available plugins
|
# empty means build all available plugins
|
||||||
plugins ? [ ],
|
plugins ? [ ],
|
||||||
|
|
||||||
|
buildVST3 ? true,
|
||||||
|
buildLV2 ? true,
|
||||||
|
buildVST2 ? true,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
rpathLibs = [
|
rpathLibs = [
|
||||||
fftwFloat
|
fftwFloat
|
||||||
];
|
];
|
||||||
|
|
||||||
|
mesonPlugins = lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "distrho-ports";
|
pname = "distrho-ports";
|
||||||
|
|
@ -52,19 +58,27 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
|
env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
|
||||||
|
|
||||||
postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
|
postFixup =
|
||||||
for file in \
|
let
|
||||||
$out/lib/lv2/vitalium.lv2/vitalium.so \
|
files = [
|
||||||
$out/lib/vst/vitalium.so \
|
(lib.optionalString buildLV2 "$out/lib/lv2/vitalium.lv2/vitalium.so")
|
||||||
$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so
|
(lib.optionalString buildVST2 "$out/lib/vst/vitalium.so")
|
||||||
do
|
(lib.optionalString buildVST3 "$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so")
|
||||||
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
|
];
|
||||||
done
|
in
|
||||||
'';
|
lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
|
||||||
|
for file in ${lib.concatMapStringsSep " \\\n" (x: "${x}") files}
|
||||||
|
do
|
||||||
|
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
mesonFlags = lib.optional (plugins != [ ]) (
|
mesonFlags = [
|
||||||
lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]"
|
(lib.mesonBool "build-lv2" buildLV2)
|
||||||
);
|
(lib.mesonBool "build-vst2" buildVST2)
|
||||||
|
(lib.mesonBool "build-vst3" buildVST3)
|
||||||
|
]
|
||||||
|
++ lib.optional (plugins != [ ]) mesonPlugins;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://distrho.sourceforge.net/ports";
|
homepage = "http://distrho.sourceforge.net/ports";
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "eartag";
|
pname = "eartag";
|
||||||
version = "0.6.5";
|
version = "1.0.2";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
|
|
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = "eartag";
|
repo = "eartag";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-sxVivQppX8KdkvHaW6xQ64Wi8Nfv5Rmwf4NADBDpOOo=";
|
hash = "sha256-Iwfk0SqxYF2bzkKZNqGonJh8MQ2c+K1wN0o4GECR/Rw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
@ -61,6 +61,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
aiofiles
|
||||||
|
aiohttp
|
||||||
pygobject3
|
pygobject3
|
||||||
eyed3
|
eyed3
|
||||||
pillow
|
pillow
|
||||||
|
|
@ -68,6 +70,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
pytaglib
|
pytaglib
|
||||||
python-magic
|
python-magic
|
||||||
pyacoustid
|
pyacoustid
|
||||||
|
xxhash
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
@ -82,6 +85,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://gitlab.gnome.org/World/eartag";
|
homepage = "https://gitlab.gnome.org/World/eartag";
|
||||||
description = "Simple music tag editor";
|
description = "Simple music tag editor";
|
||||||
|
changelog = "https://gitlab.gnome.org/World/eartag/-/releases/${version}";
|
||||||
# This seems to be using ICU license but we're flagging it to MIT license
|
# This seems to be using ICU license but we're flagging it to MIT license
|
||||||
# since ICU license is a modified version of MIT and to prevent it from
|
# since ICU license is a modified version of MIT and to prevent it from
|
||||||
# being incorrectly identified as unfree software.
|
# being incorrectly identified as unfree software.
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ecapture";
|
pname = "ecapture";
|
||||||
version = "1.4.2";
|
version = "1.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gojue";
|
owner = "gojue";
|
||||||
repo = "ecapture";
|
repo = "ecapture";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-1FyZMUII+bPQDmNK1eJkfeoTjdhe/jj2qiooWuNFsNg=";
|
hash = "sha256-Y/VDK0m+SCUtswPCA+S/U57nHy0Q/rUaPz0R0AWLxxA=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -122,7 +122,7 @@ buildGoModule rec {
|
||||||
in
|
in
|
||||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||||
|
|
||||||
vendorHash = "sha256-cN6pCfc9LEItASCoZ4+BU1AOtwMmFaUEzOM/BZ13jcI=";
|
vendorHash = "sha256-jkc8UdFNPYFwXZoei+IRb7CS06r+U0UvKfPxKeACobM=";
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation (
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
cp -R webapp $out
|
cp -R webapp $out
|
||||||
tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js
|
cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js
|
||||||
echo "${finalAttrs.version}" > "$out/version"
|
echo "${finalAttrs.version}" > "$out/version"
|
||||||
jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
|
jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "git-town";
|
pname = "git-town";
|
||||||
version = "22.1.0";
|
version = "22.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "git-town";
|
owner = "git-town";
|
||||||
repo = "git-town";
|
repo = "git-town";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU=";
|
hash = "sha256-JY0zWWMln4r2ga1jwxK+RTp8izATyovRHBf4A29pXW4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|
|
||||||
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gotests";
|
pname = "gotests";
|
||||||
version = "1.6.0";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cweill";
|
owner = "cweill";
|
||||||
repo = "gotests";
|
repo = "gotests";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw=";
|
sha256 = "sha256-lx8gbVm4s4kmm252khoSukrlj5USQS+StGuJ+419QZw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw=";
|
vendorHash = "sha256-/dP8uA1yWBrtmFNHUvcicPhA2qr5R2v1uSwYi+ciypg=";
|
||||||
|
|
||||||
# tests are broken in nix environment
|
# tests are broken in nix environment
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
||||||
6721
pkgs/by-name/gr/gridtracker2/package-lock.json
generated
6721
pkgs/by-name/gr/gridtracker2/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,22 +7,20 @@
|
||||||
fetchFromGitLab,
|
fetchFromGitLab,
|
||||||
makeBinaryWrapper,
|
makeBinaryWrapper,
|
||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
|
nix-update-script,
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
version = "2.250914.1";
|
|
||||||
in
|
|
||||||
buildNpmPackage (finalAttrs: {
|
buildNpmPackage (finalAttrs: {
|
||||||
pname = "gridtracker2";
|
pname = "gridtracker2";
|
||||||
inherit version;
|
version = "2.251106.7";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gridtracker.org";
|
owner = "gridtracker.org";
|
||||||
repo = "gridtracker2";
|
repo = "gridtracker2";
|
||||||
tag = "v${version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk=";
|
hash = "sha256-g1njDFodCHvILZZNrI/exAqWLZsbNBGHy3jlzo3uLJ8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo=";
|
npmDepsHash = "sha256-8bhOfLLsNSK+/mXku5ukLr65bfk+RwC3SyOGRHndqVQ=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeBinaryWrapper
|
makeBinaryWrapper
|
||||||
|
|
@ -50,10 +48,6 @@ buildNpmPackage (finalAttrs: {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
install -Dvm644 ${./package-lock.json} package-lock.json
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
''
|
''
|
||||||
|
|
@ -108,6 +102,8 @@ buildNpmPackage (finalAttrs: {
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Warehouse of amateur radio information";
|
description = "Warehouse of amateur radio information";
|
||||||
homepage = "https://gridtracker.org/";
|
homepage = "https://gridtracker.org/";
|
||||||
|
|
|
||||||
|
|
@ -7,18 +7,18 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "harper";
|
pname = "harper";
|
||||||
version = "0.70.0";
|
version = "0.71.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Automattic";
|
owner = "Automattic";
|
||||||
repo = "harper";
|
repo = "harper";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ksSr2styk0uDEOGrxAVRqW549oaGdzahejaJ5paYNf0=";
|
hash = "sha256-Hf086Ub0nVGET4qELDMddOErGAhK8B6ohbI5JhnU6z8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildAndTestSubdir = "harper-ls";
|
buildAndTestSubdir = "harper-ls";
|
||||||
|
|
||||||
cargoHash = "sha256-w4nwOzKV3yshvLzMeJyv32ihFv5yE+r7gNOF01zTYrU=";
|
cargoHash = "sha256-hS8fLWD3OTfEAa+4saeB9pK3zS/EQSnoQSUGIkVWocw=";
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
fetchurl,
|
|
||||||
bigloo,
|
|
||||||
}:
|
|
||||||
|
|
||||||
# Compute the “release” version of bigloo (before the first dash, if any)
|
|
||||||
let
|
|
||||||
bigloo-release =
|
|
||||||
let
|
|
||||||
inherit (lib) head splitString;
|
|
||||||
in
|
|
||||||
head (splitString "-" (builtins.parseDrvName bigloo.name).version);
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "hop";
|
|
||||||
version = "3.4.4";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz";
|
|
||||||
sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I=";
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")'
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [ bigloo ];
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--bigloo=${bigloo}/bin/bigloo"
|
|
||||||
"--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Multi-tier programming language for the Web 2.0 and the so-called diffuse Web";
|
|
||||||
homepage = "http://hop.inria.fr/";
|
|
||||||
license = licenses.gpl2Plus;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = with maintainers; [ vbgl ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +1,28 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchFromGitHub,
|
||||||
bison,
|
bison,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation {
|
||||||
pname = "hugs98";
|
pname = "hugs98";
|
||||||
version = "2006-09";
|
version = "2006-09";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz";
|
owner = "augustss";
|
||||||
sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w";
|
repo = "hugs98-plus-Sep2006";
|
||||||
|
rev = "1f7b60e05b12df00d715d535bb01c189bc1b9b3c";
|
||||||
|
hash = "sha256-g6/4kmdWKGDIu5PXVfP8O6Fl3v4bstXWAVkoxZiS6qo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchurl {
|
|
||||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs";
|
|
||||||
name = "hsbase_inline.patch";
|
|
||||||
sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ bison ];
|
nativeBuildInputs = [ bison ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = [
|
||||||
|
"-Wno-error=implicit-int"
|
||||||
|
"-Wno-error=implicit-function-declaration"
|
||||||
|
];
|
||||||
|
|
||||||
postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +";
|
postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +";
|
||||||
|
|
||||||
preConfigure = "unset STRIP";
|
preConfigure = "unset STRIP";
|
||||||
|
|
@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
broken = stdenv.hostPlatform.isDarwin;
|
|
||||||
mainProgram = "hugs";
|
mainProgram = "hugs";
|
||||||
homepage = "https://www.haskell.org/hugs";
|
homepage = "https://www.haskell.org/hugs";
|
||||||
description = "Haskell interpreter";
|
description = "Haskell interpreter";
|
||||||
|
|
|
||||||
|
|
@ -19,13 +19,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprgraphics";
|
pname = "hyprgraphics";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "hyprgraphics";
|
repo = "hyprgraphics";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=";
|
hash = "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprutils";
|
pname = "hyprutils";
|
||||||
version = "0.10.0";
|
version = "0.10.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = "hyprutils";
|
repo = "hyprutils";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=";
|
hash = "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null;
|
||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "Iosevka${toString set}";
|
pname = "Iosevka${toString set}";
|
||||||
version = "33.3.3";
|
version = "33.3.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "be5invis";
|
owner = "be5invis";
|
||||||
repo = "iosevka";
|
repo = "iosevka";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-/e65hFA8GabDrHjQ+9MthSTxUku9af0LT4W1ENI+LYc=";
|
hash = "sha256-CH9OGj9dfxY3vfLX4ipbML4rIOlXBKIOgwz3K54o1No=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-QJ3h8NdhCG+lkZ5392akKk+pVHiqmnt+DsC3imixNnw=";
|
npmDepsHash = "sha256-xNd/DGIYbjR0v+iUgj12T1jsUpIuOG0avNGnEYVdK3Q=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
remarshal
|
remarshal
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,13 @@ buildGoModule rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# rebuild with patched paths
|
# rebuild with patched paths
|
||||||
rm ipp-usb.8
|
rm ipp-usb.8
|
||||||
substituteInPlace Makefile --replace "install: all" "install: man"
|
substituteInPlace Makefile \
|
||||||
substituteInPlace systemd-udev/ipp-usb.service --replace "/sbin" "$out/bin"
|
--replace-fail "install: all" "install: man" \
|
||||||
for i in Makefile paths.go ipp-usb.8.md; do
|
--replace-fail "/usr/" "/"
|
||||||
substituteInPlace $i --replace "/usr" "$out"
|
substituteInPlace systemd-udev/ipp-usb.service --replace-fail "/sbin" "$out/bin"
|
||||||
substituteInPlace $i --replace "/var/ipp-usb" "/var/lib/ipp-usb"
|
for i in paths.go ipp-usb.8.md; do
|
||||||
|
substituteInPlace $i --replace-fail "/usr" "$out"
|
||||||
|
substituteInPlace $i --replace-fail "/var/ipp-usb" "/var/lib/ipp-usb"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -43,7 +45,7 @@ buildGoModule rec {
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# to accomodate the makefile
|
# to accommodate the makefile
|
||||||
cp $out/bin/ipp-usb .
|
cp $out/bin/ipp-usb .
|
||||||
make install DESTDIR=$out
|
make install DESTDIR=$out
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,50 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
|
||||||
nixosTests,
|
nixosTests,
|
||||||
|
|
||||||
|
fetchFromGitHub,
|
||||||
|
fetchNpmDeps,
|
||||||
|
npmHooks,
|
||||||
|
|
||||||
|
libarchive,
|
||||||
|
nodejs,
|
||||||
|
|
||||||
olm,
|
olm,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "jitsi-meet";
|
pname = "jitsi-meet";
|
||||||
version = "1.0.8043";
|
version = "1.0.8792";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
owner = "jitsi";
|
||||||
sha256 = "XJlfCMQXnHjfHQhK916RXsdPzrU2U2IaOMiXIHL1sCI=";
|
repo = "jitsi-meet";
|
||||||
|
tag = lib.last (lib.splitVersion finalAttrs.version);
|
||||||
|
hash = "sha256-K4Xrse1kpNqlUChbQnAjP5lRCRuDfJKiN/022tCmMVQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
env = {
|
||||||
|
makeFlags = "source-package";
|
||||||
|
makeCacheWritable = true;
|
||||||
|
npmDeps = fetchNpmDeps {
|
||||||
|
inherit (finalAttrs) src;
|
||||||
|
hash = "sha256-2NPfr3gskHz9zSGs//uzyCCuE+CZ295hhitDPlS9xuY=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
libarchive
|
||||||
|
nodejs
|
||||||
|
npmHooks.npmConfigHook
|
||||||
|
];
|
||||||
|
|
||||||
|
# yes, the only way in the build system is to generate a tarball and extract
|
||||||
|
# it immediately after
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir $out
|
mkdir -p $out
|
||||||
mv * $out/
|
bsdtar -xf jitsi-meet.tar.bz2 -C $out --strip-components 1
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -31,16 +55,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
passthru.updateScript = ./update.sh;
|
passthru.updateScript = ./update.sh;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Secure, Simple and Scalable Video Conferences";
|
description = "Secure, Simple and Scalable Video Conferences";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses Jitsi Videobridge
|
Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses Jitsi Videobridge
|
||||||
to provide high quality, secure and scalable video conferences.
|
to provide high quality, secure and scalable video conferences.
|
||||||
'';
|
'';
|
||||||
homepage = "https://github.com/jitsi/jitsi-meet";
|
homepage = "https://github.com/jitsi/jitsi-meet";
|
||||||
license = licenses.asl20;
|
license = lib.licenses.asl20;
|
||||||
teams = [ teams.jitsi ];
|
teams = [ lib.teams.jitsi ];
|
||||||
platforms = platforms.all;
|
inherit (nodejs.meta) platforms;
|
||||||
inherit (olm.meta) knownVulnerabilities;
|
inherit (olm.meta) knownVulnerabilities;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#!nix-shell -i bash -p curl pup common-updater-scripts
|
#!nix-shell -i bash -p curl pup nix-update
|
||||||
|
|
||||||
set -eu -o pipefail
|
set -eu -o pipefail
|
||||||
|
|
||||||
version="$(curl https://download.jitsi.org/stable/ | \
|
version="$(curl https://download.jitsi.org/jitsi-meet/src/ |
|
||||||
pup 'a[href] text{}' | \
|
pup 'a[href] text{}' |
|
||||||
awk -F'[_-]' '/jitsi-meet-web_/ {printf $4"\n"}' | \
|
awk -F'-|.tar.bz2' '/jitsi-meet-/ {printf $3"\n"}' |
|
||||||
sort -Vu | \
|
sort -Vu |
|
||||||
tail -n 1)"
|
tail -n 1)"
|
||||||
|
|
||||||
update-source-version jitsi-meet "$version"
|
nix-update --version="$version" jitsi-meet
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ in
|
||||||
inherit useVSCodeRipgrep;
|
inherit useVSCodeRipgrep;
|
||||||
commandLineArgs = extraCommandLineArgs;
|
commandLineArgs = extraCommandLineArgs;
|
||||||
|
|
||||||
version = "0.4.0";
|
version = "0.5.9";
|
||||||
pname = "kiro";
|
pname = "kiro";
|
||||||
|
|
||||||
# You can find the current VSCode version in the About dialog:
|
# You can find the current VSCode version in the About dialog:
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
"x86_64-linux": {
|
"x86_64-linux": {
|
||||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510142329--distro-linux-x64-tar-gz/202510142329-distro-linux-x64.tar.gz",
|
"url": "https://prod.download.desktop.kiro.dev/releases/202511032205--distro-linux-x64-tar-gz/202511032205-distro-linux-x64.tar.gz",
|
||||||
"hash": "sha256-Pi96jAd2qZNCk/LSv9f5n08VzOS3WwaW+eI+8PIwM9I="
|
"hash": "sha256-Xm7uRogux3bQMsWjdaamrHELnxNltRmjPLM8Mgt5+5Y="
|
||||||
},
|
},
|
||||||
"x86_64-darwin": {
|
"x86_64-darwin": {
|
||||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-x64.dmg",
|
"url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-x64.dmg",
|
||||||
"hash": "sha256-wjUyT9KF3Tg5M6Ad01sxhZlin1WySF0Tci1dAPlvh04="
|
"hash": "sha256-oJ5Xr/wJQIX3R5cLnBCv1kpULLy3ljW53LGqw4zYY5c="
|
||||||
},
|
},
|
||||||
"aarch64-darwin": {
|
"aarch64-darwin": {
|
||||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-arm64.dmg",
|
"url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-arm64.dmg",
|
||||||
"hash": "sha256-Bsul3QLJ9qbDPBnhUu7Stk4wz1yJkYk9eMrtUyQ4rbU="
|
"hash": "sha256-dtc/Wfs8GzVPHny58MDRFSr9gG0hwdZC5qz5uIJh6N4="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@
|
||||||
lib,
|
lib,
|
||||||
openal,
|
openal,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
|
copyDesktopItems,
|
||||||
|
makeDesktopItem,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
|
|
@ -25,6 +27,23 @@ buildDotnetModule rec {
|
||||||
|
|
||||||
runtimeDeps = [ openal ];
|
runtimeDeps = [ openal ];
|
||||||
|
|
||||||
|
nativeBuildInputs = [ copyDesktopItems ];
|
||||||
|
|
||||||
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
|
name = "knossos";
|
||||||
|
exec = "Knossos.NET";
|
||||||
|
icon = "knossos";
|
||||||
|
desktopName = "Knossos.NET";
|
||||||
|
comment = "Multi-platform launcher for Freespace 2 Open";
|
||||||
|
categories = [ "Game" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -Dm644 $src/packaging/linux/knossos-512.png $out/share/icons/hicolor/512x512/apps/knossos.png
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/KnossosNET/Knossos.NET";
|
homepage = "https://github.com/KnossosNET/Knossos.NET";
|
||||||
description = "Multi-platform launcher for Freespace 2 Open";
|
description = "Multi-platform launcher for Freespace 2 Open";
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libphonenumber";
|
pname = "libphonenumber";
|
||||||
version = "9.0.17";
|
version = "9.0.18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "libphonenumber";
|
repo = "libphonenumber";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-xw159QIBNloMks/888shAEPdfd4WKmIGDRpmJ4h2JsE=";
|
hash = "sha256-u+2QN72ZvsfpKAsU9R94cq+S7aKSwZtIsg+uUz/sDtU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
||||||
|
|
@ -75,13 +75,13 @@ let
|
||||||
in
|
in
|
||||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "llama-cpp";
|
pname = "llama-cpp";
|
||||||
version = "6908";
|
version = "6981";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ggml-org";
|
owner = "ggml-org";
|
||||||
repo = "llama.cpp";
|
repo = "llama.cpp";
|
||||||
tag = "b${finalAttrs.version}";
|
tag = "b${finalAttrs.version}";
|
||||||
hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A=";
|
hash = "sha256-0WtiHDlMeb+m2XcMwkPFY1mtwVTwRJUoxQSwzpiRbts=";
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,11 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "LycheeSlicer";
|
pname = "LycheeSlicer";
|
||||||
version = "7.4.5";
|
version = "7.4.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
|
url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
|
||||||
hash = "sha256-UY8bS3nPhUqyBeMD7Ou6OJZ2LKFi3QbNGeTSmtC1Sbg=";
|
hash = "sha256-4Cqhr++RP8FlWUMQyfpEY7df2Ai3aqrzwX+kZ+SzGCQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ index 8c2cbef..46e7f73 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
async bool check_vkbasalt_installed_async () {
|
async bool check_vkbasalt_installed_async () {
|
||||||
- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" };
|
- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so", "/usr/lib64/vkbasalt/libvkbasalt.so" };
|
||||||
+ string[] paths = { "@vkbasalt@" };
|
+ string[] paths = { "@vkbasalt@" };
|
||||||
foreach (var path in paths) {
|
foreach (var path in paths) {
|
||||||
if (FileUtils.test (path, FileTest.EXISTS)) {
|
if (FileUtils.test (path, FileTest.EXISTS)) {
|
||||||
|
|
|
||||||
|
|
@ -25,13 +25,13 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "mangojuice";
|
pname = "mangojuice";
|
||||||
version = "0.8.6";
|
version = "0.8.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "radiolamp";
|
owner = "radiolamp";
|
||||||
repo = "mangojuice";
|
repo = "mangojuice";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-EVjKO+03o8es2t2/K1QuUIhXey7+2VNF37yXiMrv4o4=";
|
hash = "sha256-M8aKS360AsgoSKCyZXdtD7SbMDvK6OgAuNoGa68NZRQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
|
|
||||||
index 1afa856f..dcd36f84 100644
|
|
||||||
--- a/src/frontend/qt_sdl/CMakeLists.txt
|
|
||||||
+++ b/src/frontend/qt_sdl/CMakeLists.txt
|
|
||||||
@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)
|
|
||||||
if (USE_QT6)
|
|
||||||
find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)
|
|
||||||
set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
|
|
||||||
+ if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10")
|
|
||||||
+ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
|
|
||||||
+ list(APPEND QT_LINK_LIBS Qt6::GuiPrivate)
|
|
||||||
+ endif()
|
|
||||||
else()
|
|
||||||
find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)
|
|
||||||
set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)
|
|
||||||
|
|
@ -38,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";
|
hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fix-build-qt-6.10.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
diff --git a/bin/melos.dart b/bin/melos.dart
|
diff --git a/bin/melos.dart b/bin/melos.dart
|
||||||
index 0db7013..218276f 100644
|
index 2476436..bd79fad 100644
|
||||||
--- a/packages/melos/bin/melos.dart
|
--- a/packages/melos/bin/melos.dart
|
||||||
+++ b/packages/melos/bin/melos.dart
|
+++ b/packages/melos/bin/melos.dart
|
||||||
@@ -1,11 +1,37 @@
|
@@ -1,11 +1,72 @@
|
||||||
+import 'dart:io';
|
|
||||||
import 'package:cli_launcher/cli_launcher.dart';
|
import 'package:cli_launcher/cli_launcher.dart';
|
||||||
import 'package:melos/src/command_runner.dart';
|
import 'package:melos/src/command_runner.dart';
|
||||||
|
+import 'dart:io';
|
||||||
|
+import 'package:yaml/yaml.dart';
|
||||||
|
+import 'package:path/path.dart' as path;
|
||||||
|
|
||||||
-Future<void> main(List<String> arguments) async => launchExecutable(
|
-Future<void> main(List<String> arguments) async => launchExecutable(
|
||||||
- arguments,
|
- arguments,
|
||||||
|
|
@ -15,12 +17,13 @@ index 0db7013..218276f 100644
|
||||||
- entrypoint: melosEntryPoint,
|
- entrypoint: melosEntryPoint,
|
||||||
- ),
|
- ),
|
||||||
-);
|
-);
|
||||||
+Future<void> main(List<String> arguments) async {
|
+final ExecutableName executableName = ExecutableName('melos');
|
||||||
+ final melosYamlPath = findMelosYaml();
|
|
||||||
+
|
+
|
||||||
+ if (melosYamlPath == null) {
|
+Future<void> main(List<String> arguments) async {
|
||||||
+ print('Error: melos.yaml not found in the project.');
|
+ final workspaceRoot = _findLocalInstallation(Directory.current);
|
||||||
+ // Handle the error as needed
|
+
|
||||||
|
+ if (workspaceRoot == null) {
|
||||||
|
+ print("Error: Could not find your work ");
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
|
@ -29,22 +32,54 @@ index 0db7013..218276f 100644
|
||||||
+ LaunchContext(
|
+ LaunchContext(
|
||||||
+ directory: Directory.current,
|
+ directory: Directory.current,
|
||||||
+ localInstallation: ExecutableInstallation(
|
+ localInstallation: ExecutableInstallation(
|
||||||
+ name: ExecutableName('melos'),
|
+ name: executableName,
|
||||||
+ isSelf: false,
|
+ isSelf: false,
|
||||||
+ packageRoot: melosYamlPath,
|
+ packageRoot: workspaceRoot,
|
||||||
+ ),
|
+ ),
|
||||||
+ ),
|
+ ),
|
||||||
+ );
|
+ );
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+Directory? findMelosYaml() {
|
+// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249
|
||||||
+ var directory = Directory.current;
|
+Directory? _findLocalInstallation(
|
||||||
+ while (directory.path != directory.parent.path) {
|
+ Directory start,
|
||||||
+ final melosYamlPath = '${directory.path}/melos.yaml';
|
+) {
|
||||||
+ if (File(melosYamlPath).existsSync()) {
|
+ if (path.equals(start.path, start.parent.path)) {
|
||||||
+ return directory;
|
+ return null;
|
||||||
+ }
|
|
||||||
+ directory = directory.parent;
|
|
||||||
+ }
|
+ }
|
||||||
+ return null;
|
+
|
||||||
|
+ final pubspecFile = File(path.join(start.path, 'pubspec.yaml'));
|
||||||
|
+ if (pubspecFile.existsSync()) {
|
||||||
|
+ final pubspecString = pubspecFile.readAsStringSync();
|
||||||
|
+ String? name;
|
||||||
|
+ YamlMap? dependencies;
|
||||||
|
+ YamlMap? devDependencies;
|
||||||
|
+
|
||||||
|
+ try {
|
||||||
|
+ final pubspecYaml = loadYamlDocument(
|
||||||
|
+ pubspecString,
|
||||||
|
+ sourceUrl: pubspecFile.uri,
|
||||||
|
+ );
|
||||||
|
+ final pubspec = pubspecYaml.contents as YamlMap;
|
||||||
|
+ name = pubspec['name'] as String?;
|
||||||
|
+ dependencies = pubspec['dependencies'] as YamlMap?;
|
||||||
|
+ devDependencies = pubspec['dev_dependencies'] as YamlMap?;
|
||||||
|
+ } catch (error, stackTrace) {
|
||||||
|
+ throw StateError(
|
||||||
|
+ 'Could not parse pubspec.yaml at ${start.path}.\n$error\n$stackTrace',
|
||||||
|
+ );
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ final isSelf = name == executableName.package;
|
||||||
|
+
|
||||||
|
+ if ((isSelf) ||
|
||||||
|
+ (dependencies != null &&
|
||||||
|
+ dependencies.containsKey(executableName.package)) ||
|
||||||
|
+ (devDependencies != null &&
|
||||||
|
+ devDependencies.containsKey(executableName.package))) {
|
||||||
|
+ return start;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return _findLocalInstallation(start.parent);
|
||||||
+}
|
+}
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,12 @@
|
||||||
buildDartApplication,
|
buildDartApplication,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "7.1.1";
|
version = "7.3.0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "invertase";
|
owner = "invertase";
|
||||||
repo = "melos";
|
repo = "melos";
|
||||||
tag = "melos-v${version}";
|
tag = "melos-v${version}";
|
||||||
hash = "sha256-i75fbo0lqDszo2pDtkWXQMt+3IoWsK7t05YU2IjqTmw=";
|
hash = "sha256-XTEhH8F54BoXJ1QNhUIZszHQoDwP0Za1LPQ6Dv9sR08=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
buildDartApplication {
|
buildDartApplication {
|
||||||
|
|
@ -17,8 +17,8 @@ buildDartApplication {
|
||||||
inherit version src;
|
inherit version src;
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# This patch (created a melos 6.1.0) modify the method melos use to find path to the root of the projects.
|
# Patch melos entrypoint to bypass cli_launcher which throws because it does not find melos in the "classic" folders eg : .dart_tool or pub cache.
|
||||||
# It is needed because when melos is in the nixstore, it break it and fail to find the projects root with melos.yaml
|
# https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L236
|
||||||
./add-generic-main.patch
|
./add-generic-main.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,21 +4,21 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "_fe_analyzer_shared",
|
"name": "_fe_analyzer_shared",
|
||||||
"sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b",
|
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "90.0.0"
|
"version": "91.0.0"
|
||||||
},
|
},
|
||||||
"analyzer": {
|
"analyzer": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "analyzer",
|
"name": "analyzer",
|
||||||
"sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f",
|
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "8.3.0"
|
"version": "8.4.1"
|
||||||
},
|
},
|
||||||
"ansi_styles": {
|
"ansi_styles": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
@ -184,11 +184,11 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "crypto",
|
"name": "crypto",
|
||||||
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
|
"sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "3.0.6"
|
"version": "3.0.7"
|
||||||
},
|
},
|
||||||
"dart_style": {
|
"dart_style": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
@ -364,11 +364,11 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "mustache_template",
|
"name": "mustache_template",
|
||||||
"sha256": "d9aa84d114368b7f1727b7014b85bb0b234daeafe1518824c82d32703b3964f6",
|
"sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "2.0.1"
|
"version": "2.0.2"
|
||||||
},
|
},
|
||||||
"node_preamble": {
|
"node_preamble": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
@ -400,6 +400,16 @@
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "1.9.1"
|
"version": "1.9.1"
|
||||||
},
|
},
|
||||||
|
"petitparser": {
|
||||||
|
"dependency": "transitive",
|
||||||
|
"description": {
|
||||||
|
"name": "petitparser",
|
||||||
|
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
|
||||||
|
"url": "https://pub.dev"
|
||||||
|
},
|
||||||
|
"source": "hosted",
|
||||||
|
"version": "7.0.1"
|
||||||
|
},
|
||||||
"platform": {
|
"platform": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
|
|
@ -690,6 +700,16 @@
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "1.2.1"
|
"version": "1.2.1"
|
||||||
},
|
},
|
||||||
|
"xml": {
|
||||||
|
"dependency": "transitive",
|
||||||
|
"description": {
|
||||||
|
"name": "xml",
|
||||||
|
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
|
||||||
|
"url": "https://pub.dev"
|
||||||
|
},
|
||||||
|
"source": "hosted",
|
||||||
|
"version": "6.6.1"
|
||||||
|
},
|
||||||
"yaml": {
|
"yaml": {
|
||||||
"dependency": "direct dev",
|
"dependency": "direct dev",
|
||||||
"description": {
|
"description": {
|
||||||
|
|
|
||||||
|
|
@ -8,29 +8,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "mihomo";
|
pname = "mihomo";
|
||||||
version = "1.19.11";
|
version = "1.19.15";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MetaCubeX";
|
owner = "MetaCubeX";
|
||||||
repo = "mihomo";
|
repo = "mihomo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8=";
|
hash = "sha256-WygZtgXikBq7jhXeppDD74WcV9STxUviQqx8Cz1R0X4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
vendorHash = "sha256-t+v+szM5uXRy173tAtRf+IqiGNHaL6nNRgf6OZmeJyQ=";
|
||||||
# https://github.com/MetaCubeX/mihomo/pull/2178
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/MetaCubeX/mihomo/commit/63ad95e10f40ffc90ec93497aac562765af7a471.patch";
|
|
||||||
hash = "sha256-ZE2dlr0t//Q1CVy2ql/TWuLEALdF1ZCYTOVK87bKWQg=";
|
|
||||||
})
|
|
||||||
# https://github.com/MetaCubeX/mihomo/pull/2177
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/MetaCubeX/mihomo/commit/b06ec5bef810ec8d009f52428188440df0484ce4.patch";
|
|
||||||
hash = "sha256-XQhlST4pa//+Bg5hWc2zADulz8FeEiHwB99Rw9o24b0=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8=";
|
|
||||||
|
|
||||||
excludedPackages = [ "./test" ];
|
excludedPackages = [ "./test" ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,16 +9,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "mprisence";
|
pname = "mprisence";
|
||||||
version = "1.2.9";
|
version = "1.2.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lazykern";
|
owner = "lazykern";
|
||||||
repo = "mprisence";
|
repo = "mprisence";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-qF0jG9tc3tp2ChGCGE3YUZoTaQoTmLLd39iBWeSS7wU=";
|
hash = "sha256-M0UfdUw65PD3HuKAh6PbbuNzyHVbYUfMuQT8em6OnaM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-32zBqZJoo0C+4ogEbEz4rxyATG9dbibp7NxMXYYJNsE=";
|
cargoHash = "sha256-STvMAkCFrMjekz2wk2UtEi6nsEVFnuIhFinxWWbcIto=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
||||||
10
pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch
Normal file
10
pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- mrtg-2.17.10/configure.bak 2025-10-17 20:44:24.878718603 +0100
|
||||||
|
+++ mrtg-2.17-10/configure 2025-10-17 20:44:40.343747835 +0100
|
||||||
|
@@ -3664,6 +3664,7 @@
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <stdio.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
long long b, a = -0x3AFAFAFAFAFAFAFALL;
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
makeWrapper,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
perl,
|
perl,
|
||||||
gd,
|
gd,
|
||||||
|
|
@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w=";
|
sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
# add support for ipv6 snmp:
|
# add support for ipv6 snmp:
|
||||||
# https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341
|
# https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341
|
||||||
|
|
@ -32,11 +35,28 @@ stdenv.mkDerivation rec {
|
||||||
rrdtool
|
rrdtool
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# gcc14 broke detection of printf format specifiers
|
||||||
|
# building from master seems to be fixed upstream, so next release can (likely) drop the patch
|
||||||
|
# just keep the CFLAGS below
|
||||||
|
./configure-long-long-format-gcc14.patch
|
||||||
|
];
|
||||||
|
env.NIX_CFLAGS_COMPILE = "-Werror";
|
||||||
|
env.NIX_CFLAGS_LINK = "-lm";
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
# mrtg wants plain C locale
|
||||||
|
wrapProgram $out/bin/mrtg --set LANG C
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Multi Router Traffic Grapher";
|
description = "Multi Router Traffic Grapher";
|
||||||
homepage = "https://oss.oetiker.ch/mrtg/";
|
homepage = "https://oss.oetiker.ch/mrtg/";
|
||||||
license = licenses.gpl2Only;
|
license = licenses.gpl2Only;
|
||||||
maintainers = with maintainers; [ robberer ];
|
maintainers = with maintainers; [
|
||||||
|
robberer
|
||||||
|
usovalx
|
||||||
|
];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,10 @@
|
||||||
}:
|
}:
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "nix-output-monitor";
|
pname = "nix-output-monitor";
|
||||||
version = "2.1.6";
|
version = "2.1.8";
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.6.tar.gz";
|
url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.8.tar.gz";
|
||||||
sha256 = "0v291s6lx9rxlw38a3329gc37nyl2x24blyrf9rv8lzxc1q4bz31";
|
sha256 = "09zpz9dbllaqngkg6hz0vl4sx3kbvlp4cdk6lqa0kgszrwsdwl9r";
|
||||||
};
|
};
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,25 @@ let
|
||||||
python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; };
|
python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; };
|
||||||
pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; };
|
pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; };
|
||||||
|
|
||||||
|
# local revert of 58daf511687f191829238fc7f571e08dc9dedf56,
|
||||||
|
# working around https://github.com/google/or-tools/issues/4911
|
||||||
|
_highs = highs.overrideAttrs (old: rec {
|
||||||
|
version = "1.10.0";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ERGO-Code";
|
||||||
|
repo = "HiGHS";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
|
||||||
|
};
|
||||||
|
# CMake Error in CMakeLists.txt:
|
||||||
|
# Imported target "highs::highs" includes non-existent path
|
||||||
|
# "/include"
|
||||||
|
# in its INTERFACE_INCLUDE_DIRECTORIES.
|
||||||
|
postPatch = ''
|
||||||
|
sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "or-tools";
|
pname = "or-tools";
|
||||||
|
|
@ -124,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
glpk
|
glpk
|
||||||
gbenchmark
|
gbenchmark
|
||||||
gtest
|
gtest
|
||||||
highs
|
_highs
|
||||||
python3.pkgs.absl-py
|
python3.pkgs.absl-py
|
||||||
python3.pkgs.pybind11
|
python3.pkgs.pybind11
|
||||||
python3.pkgs.pybind11-abseil
|
python3.pkgs.pybind11-abseil
|
||||||
|
|
@ -138,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
];
|
];
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
abseil-cpp
|
abseil-cpp
|
||||||
highs
|
_highs
|
||||||
protobuf
|
protobuf
|
||||||
python-protobuf
|
python-protobuf
|
||||||
python3.pkgs.immutabledict
|
python3.pkgs.immutabledict
|
||||||
|
|
|
||||||
|
|
@ -6,15 +6,15 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (stdenvNoCC.hostPlatform) system;
|
inherit (stdenvNoCC.hostPlatform) system;
|
||||||
version = "2.0.3-19876";
|
version = "2.0.4-19887";
|
||||||
sourceData = {
|
sourceData = {
|
||||||
aarch64-darwin = {
|
aarch64-darwin = {
|
||||||
arch = "arm64";
|
arch = "arm64";
|
||||||
hash = "sha256-3Ppc0zWEgR/nTS7R9uAkUYYgYu5q2TWmfd3evT+Z8g4=";
|
hash = "sha256-uog0B1Dro5lkSMDWr+FOvmeH/ue3NoNNvIUR/+FZENs=";
|
||||||
};
|
};
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
arch = "amd64";
|
arch = "amd64";
|
||||||
hash = "sha256-+JpyynFKmDjHLetvvEpQ0qw4crAVmx0ucWm+bvtZ2Fg=";
|
hash = "sha256-lLj4BlSG01CMYCVBWuASjxCjrczv7mbC1iXM0WgWHtw=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
sources = lib.mapAttrs (
|
sources = lib.mapAttrs (
|
||||||
|
|
|
||||||
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
buildDartApplication rec {
|
buildDartApplication rec {
|
||||||
pname = "protoc-gen-dart";
|
pname = "protoc-gen-dart";
|
||||||
version = "22.5.0";
|
version = "24.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "protobuf.dart";
|
repo = "protobuf.dart";
|
||||||
tag = "protoc_plugin-v${version}";
|
tag = "protoc_plugin-v${version}";
|
||||||
hash = "sha256-8pSCYlbZLqHnpetM4luyfGo1qnWgKx93JPjRVWCOX0w=";
|
hash = "sha256-DEuvwBJhSo4o5ydnutxv2PCIRgS+2dE7u3RleidhAUM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,11 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "analyzer",
|
"name": "analyzer",
|
||||||
"sha256": "a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0",
|
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "8.4.0"
|
"version": "8.4.1"
|
||||||
},
|
},
|
||||||
"args": {
|
"args": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
@ -104,11 +104,11 @@
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
"description": {
|
"description": {
|
||||||
"name": "crypto",
|
"name": "crypto",
|
||||||
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
|
"sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
|
||||||
"url": "https://pub.dev"
|
"url": "https://pub.dev"
|
||||||
},
|
},
|
||||||
"source": "hosted",
|
"source": "hosted",
|
||||||
"version": "3.0.6"
|
"version": "3.0.7"
|
||||||
},
|
},
|
||||||
"dart_style": {
|
"dart_style": {
|
||||||
"dependency": "transitive",
|
"dependency": "transitive",
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,16 @@
|
||||||
|
|
||||||
buildNpmPackage (finalAttrs: {
|
buildNpmPackage (finalAttrs: {
|
||||||
pname = "qwen-code";
|
pname = "qwen-code";
|
||||||
version = "0.1.4";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "QwenLM";
|
owner = "QwenLM";
|
||||||
repo = "qwen-code";
|
repo = "qwen-code";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8=";
|
hash = "sha256-nav99mAXwgJfyHr8dLGjUMAJMmyWhjt4TN9IVGHSyJs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4=";
|
npmDepsHash = "sha256-gWGPrbHzWfH6bwHXySbDN6EzxULQZ3eWPaFBKsa5JUk=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
jq
|
jq
|
||||||
|
|
|
||||||
|
|
@ -32,13 +32,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Feature-rich pinyin schema for Rime, basic edition";
|
description = "Feature-rich pinyin schema for Rime";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
万象拼音基础版 is a basic quanpin and shuangpin input schema for Rime based on
|
万象拼音 is a quanpin and shuangpin input schema for Rime based on
|
||||||
[万象 dictionaries and grammar models](https://github.com/amzxyz/RIME-LMDG),
|
[万象 dictionaries and grammar models](https://github.com/amzxyz/RIME-LMDG),
|
||||||
supporting traditional shuangpin as well as tonal schemata such as 自然龙 and
|
supporting traditional shuangpin as well as tonal schemata such as 自然龙 and
|
||||||
龙码.
|
龙码.
|
||||||
|
|
||||||
|
This package is built from the upstream repository snapshots, and includes
|
||||||
|
all the auxiliary encodings.
|
||||||
|
|
||||||
The schema requires to work the grammar model `wanxiang-lts-zh-hans.gram`.
|
The schema requires to work the grammar model `wanxiang-lts-zh-hans.gram`.
|
||||||
However, this file is
|
However, this file is
|
||||||
[released](https://github.com/amzxyz/RIME-LMDG/releases/tag/LTS) by
|
[released](https://github.com/amzxyz/RIME-LMDG/releases/tag/LTS) by
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
autoreconfHook,
|
autoreconfHook,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -12,20 +13,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gumpu";
|
owner = "gumpu";
|
||||||
repo = "ROBODoc";
|
repo = "ROBODoc";
|
||||||
rev = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
|
hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "troff_generator-fix";
|
||||||
|
url = "https://github.com/gumpu/ROBODoc/commit/0f8b35c42523810415bec70bb2200d2ecb41c82f.patch?index=full";
|
||||||
|
hash = "sha256-Pbuc1gHrOeHbR4QT/dZ8wP+vqYQlilayjCGKOJP5wvk=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
substituteInPlace Docs/makefile.am \
|
substituteInPlace Docs/makefile.am \
|
||||||
--replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS ='
|
--replace-fail 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS ='
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
homepage = "https://github.com/gumpu/ROBODoc";
|
homepage = "https://github.com/gumpu/ROBODoc";
|
||||||
description = "Documentation Extraction Tool";
|
description = "Documentation Extraction Tool";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
|
@ -47,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++,
|
Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++,
|
||||||
Java -- basically any program in which you can use remarks/comments.
|
Java -- basically any program in which you can use remarks/comments.
|
||||||
'';
|
'';
|
||||||
license = with licenses; gpl3Plus;
|
license = lib.licenses.gpl3Plus;
|
||||||
maintainers = [ ];
|
maintainers = with lib.maintainers; [ iedame ];
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
|
mainProgram = "robodoc";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -8,16 +8,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "rumdl";
|
pname = "rumdl";
|
||||||
version = "0.0.166";
|
version = "0.0.169";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rvben";
|
owner = "rvben";
|
||||||
repo = "rumdl";
|
repo = "rumdl";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg=";
|
hash = "sha256-1ly0bAA8NGGqdF6U/BYGvr+aR6OU0ArbK7A0vAMdtlQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU=";
|
cargoHash = "sha256-qnNm69SM3pt0LAIOvu0xhnTFft+SCD2LmY3hNoturmo=";
|
||||||
|
|
||||||
cargoBuildFlags = [
|
cargoBuildFlags = [
|
||||||
"--bin=rumdl"
|
"--bin=rumdl"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
pkg-config,
|
pkg-config,
|
||||||
stdenv,
|
stdenv,
|
||||||
flac,
|
flac,
|
||||||
|
fmt,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
@ -29,10 +30,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL2
|
SDL2
|
||||||
flac
|
flac
|
||||||
|
fmt
|
||||||
];
|
];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Remove the bundled fmt directory
|
||||||
|
rm -rf 3rdparty/fmt
|
||||||
|
|
||||||
|
# Patch CMakeLists.txt to replace bundled fmt with provided library
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail 'add_bundled_fmtlib()' 'find_package(fmt REQUIRED)'
|
||||||
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
(lib.cmakeBool "USE_DEC_ADLMIDI" false)
|
(lib.cmakeBool "USE_DEC_ADLMIDI" false)
|
||||||
(lib.cmakeBool "USE_DEC_BASSMIDI" false)
|
(lib.cmakeBool "USE_DEC_BASSMIDI" false)
|
||||||
|
|
|
||||||
|
|
@ -50,24 +50,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "spotify-player";
|
pname = "spotify-player";
|
||||||
version = "0.21.0";
|
version = "0.21.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aome510";
|
owner = "aome510";
|
||||||
repo = "spotify-player";
|
repo = "spotify-player";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-nOswrYt9NrzJV6CFBWZCpj/wIJnIgmr3i2TreAKGGPI=";
|
hash = "sha256-yjm5NFW+6vEyv45AVfwx+6w2dJ3lKj/UM2NQhGW5SSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-YarKRApcQHom3AQIirqGdmUOuy5B+BRehLijvF/GRPc=";
|
cargoHash = "sha256-rqDLkzCl7gn3s/37MPytYaGb0tdtemYi8bgEkrkllDU=";
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-build-failure.patch";
|
|
||||||
url = "https://github.com/aome510/spotify-player/commit/77af13b48b2a03e61fef1cffea899929057551dc.patch";
|
|
||||||
hash = "sha256-5q8W0X49iZLYdwrBiZJTESb628VPamrm0zEYwDm8CVk=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
||||||
|
|
@ -1,44 +1,50 @@
|
||||||
{
|
{
|
||||||
stdenv,
|
|
||||||
lib,
|
lib,
|
||||||
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch,
|
replaceVars,
|
||||||
aws-sdk-cpp,
|
tracy,
|
||||||
bzip2,
|
|
||||||
|
# nativeBuildInputs
|
||||||
cmake,
|
cmake,
|
||||||
ninja,
|
ninja,
|
||||||
zlib,
|
qt6,
|
||||||
openssl,
|
|
||||||
curl,
|
# buildInputs
|
||||||
glew,
|
aws-sdk-cpp,
|
||||||
geos,
|
|
||||||
boost,
|
boost,
|
||||||
spdlog,
|
bzip2,
|
||||||
stb,
|
geos,
|
||||||
|
geographiclib,
|
||||||
|
glew,
|
||||||
|
glm,
|
||||||
|
gtest,
|
||||||
|
howard-hinnant-date,
|
||||||
|
libSM,
|
||||||
libcpr,
|
libcpr,
|
||||||
libpng,
|
libpng,
|
||||||
libSM,
|
|
||||||
geographiclib,
|
|
||||||
howard-hinnant-date,
|
|
||||||
re2,
|
|
||||||
gtest,
|
|
||||||
glm,
|
|
||||||
qt6,
|
|
||||||
onetbb,
|
onetbb,
|
||||||
tracy,
|
openssl,
|
||||||
replaceVars,
|
|
||||||
python3,
|
python3,
|
||||||
|
range-v3,
|
||||||
|
re2,
|
||||||
|
spdlog,
|
||||||
|
stb,
|
||||||
|
zlib,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
gtestSkip = [
|
gtestSkip = [
|
||||||
# Skip tests requiring network access
|
# Skip tests requiring network access
|
||||||
"AwsLevel*DataProvider.FindKeyNow"
|
|
||||||
"AwsLevel*DataProvider.FindKeyFixed"
|
"AwsLevel*DataProvider.FindKeyFixed"
|
||||||
"AwsLevel*DataProvider.LoadObjectByKey"
|
"AwsLevel*DataProvider.FindKeyNow"
|
||||||
"AwsLevel*DataProvider.Refresh"
|
|
||||||
"AwsLevel*DataProvider.GetAvailableProducts"
|
"AwsLevel*DataProvider.GetAvailableProducts"
|
||||||
"AwsLevel*DataProvider.GetTimePointsByDate"
|
"AwsLevel*DataProvider.GetTimePointsByDate"
|
||||||
|
"AwsLevel*DataProvider.LoadObjectByKey"
|
||||||
"AwsLevel*DataProvider.Prune"
|
"AwsLevel*DataProvider.Prune"
|
||||||
|
"AwsLevel*DataProvider.Refresh"
|
||||||
|
"IemApiProviderTest.*"
|
||||||
|
"NtpClient.*"
|
||||||
|
"NwsApiProviderTest.*"
|
||||||
"UpdateManagerTest.CheckForUpdates"
|
"UpdateManagerTest.CheckForUpdates"
|
||||||
"WarningsProvider*\"https"
|
"WarningsProvider*\"https"
|
||||||
|
|
||||||
|
|
@ -50,47 +56,16 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "supercell-wx";
|
pname = "supercell-wx";
|
||||||
version = "0.4.9";
|
version = "0.5.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dpaulat";
|
owner = "dpaulat";
|
||||||
repo = "supercell-wx";
|
repo = "supercell-wx";
|
||||||
rev = "refs/tags/v${finalAttrs.version}-release";
|
tag = "v${finalAttrs.version}-release";
|
||||||
sha256 = "sha256-3fVUxbGosN4Y4h8BJXUV7DNv7VZTma+IsV94+Zt8DCA=";
|
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-1n1WXBLco2TpyhS8KA1tk6HzRIXLqS6YV3aYagoQiTM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://supercell-wx.rtfd.io";
|
|
||||||
downloadPage = "https://github.com/dpaulat/supercell-wx/releases";
|
|
||||||
description = "Live visualization of NEXRAD weather data and alerts";
|
|
||||||
longDescription = ''
|
|
||||||
Supercell Wx is a free, open source application to visualize live and
|
|
||||||
archive NEXRAD Level 2 and Level 3 data, and severe weather alerts.
|
|
||||||
It displays continuously updating weather data on top of a responsive
|
|
||||||
map, providing the capability to monitor weather events using
|
|
||||||
reflectivity, velocity, and other products.
|
|
||||||
'';
|
|
||||||
license = lib.licenses.mit;
|
|
||||||
mainProgram = "supercell-wx";
|
|
||||||
platforms = [
|
|
||||||
"x86_64-linux"
|
|
||||||
# "aarch64-linux"
|
|
||||||
];
|
|
||||||
maintainers = with lib.maintainers; [ aware70 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN";
|
|
||||||
env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
# These tests aren't built by 'all', but ctest still tries to run them.
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCMAKE_CTEST_ARGUMENTS=-E;'test_mln_core|test_mln_widgets'"
|
|
||||||
"-DSTB_INCLUDE_DIR=${stb}/include/stb"
|
|
||||||
"-DFETCHCONTENT_SOURCE_DIR_TRACY=${tracy.src}"
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# These are for Nix compatibility {{{
|
# These are for Nix compatibility {{{
|
||||||
./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions
|
./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions
|
||||||
|
|
@ -105,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
# These may be or already are submitted upstream {{{
|
# These may be or already are submitted upstream {{{
|
||||||
./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp
|
./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp
|
||||||
./patches/fix-qt-6.10.patch
|
./patches/fix-qt-6.10.patch
|
||||||
|
./patches/fix-find-opengl.patch
|
||||||
# }}}
|
# }}}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -114,6 +90,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
--replace-fail "CMAKE_SOURCE_DIR" "PROJECT_SOURCE_DIR"
|
--replace-fail "CMAKE_SOURCE_DIR" "PROJECT_SOURCE_DIR"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
env = {
|
||||||
|
CXXFLAGS = lib.concatStringsSep " " [
|
||||||
|
"-Wno-error=deprecated-declarations"
|
||||||
|
"-Wno-error=maybe-uninitialized"
|
||||||
|
"-Wno-error=restrict"
|
||||||
|
"-Wno-error=stringop-overflow"
|
||||||
|
"-DQT_NO_USE_NODISCARD_FILE_OPEN"
|
||||||
|
];
|
||||||
|
GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
|
||||||
|
};
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
# CMake Error at external/aws-sdk-cpp/crt/aws-crt-cpp/cmake/EnforceSubmoduleVersions.cmake:18 (message):
|
||||||
|
# ENFORCE_SUBMODULE_VERSIONS is ON but Git was not found.
|
||||||
|
(lib.cmakeBool "ENFORCE_SUBMODULE_VERSIONS" false)
|
||||||
|
|
||||||
|
# These tests aren't built by 'all', but ctest still tries to run them.
|
||||||
|
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;'test_mln_core|test_mln_widgets'")
|
||||||
|
(lib.cmakeFeature "STB_INCLUDE_DIR" "${stb}/include/stb")
|
||||||
|
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TRACY" "${tracy.src}")
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
|
|
@ -121,36 +119,37 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
zlib
|
|
||||||
openssl
|
|
||||||
qt6.qtbase
|
|
||||||
qt6.qttools
|
|
||||||
qt6.qtmultimedia
|
|
||||||
qt6.qtpositioning
|
|
||||||
qt6.qtimageformats
|
|
||||||
aws-sdk-cpp
|
aws-sdk-cpp
|
||||||
howard-hinnant-date
|
|
||||||
boost
|
boost
|
||||||
onetbb
|
bzip2
|
||||||
glew
|
|
||||||
geos
|
geos
|
||||||
spdlog
|
|
||||||
stb
|
|
||||||
libcpr
|
|
||||||
libpng
|
|
||||||
libSM
|
|
||||||
re2
|
|
||||||
openssl
|
|
||||||
# FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
|
# FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
|
||||||
(geographiclib.overrideAttrs {
|
(geographiclib.overrideAttrs {
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
})
|
})
|
||||||
gtest
|
glew
|
||||||
glm
|
glm
|
||||||
bzip2
|
gtest
|
||||||
|
howard-hinnant-date
|
||||||
|
libSM
|
||||||
|
libcpr
|
||||||
|
libpng
|
||||||
|
onetbb
|
||||||
|
openssl
|
||||||
(python3.withPackages (ps: [
|
(python3.withPackages (ps: [
|
||||||
ps.geopandas
|
ps.geopandas
|
||||||
|
ps.jinja2
|
||||||
]))
|
]))
|
||||||
|
qt6.qtbase
|
||||||
|
qt6.qtimageformats
|
||||||
|
qt6.qtmultimedia
|
||||||
|
qt6.qtpositioning
|
||||||
|
qt6.qttools
|
||||||
|
re2
|
||||||
|
range-v3
|
||||||
|
spdlog
|
||||||
|
stb
|
||||||
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
# Currently crashes on wayland; must force X11
|
# Currently crashes on wayland; must force X11
|
||||||
|
|
@ -158,10 +157,33 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
"--set QT_QPA_PLATFORM xcb"
|
"--set QT_QPA_PLATFORM xcb"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
# Install .desktop file and icons
|
# Install .desktop file and icons
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -m0644 -D "$src/scwx-qt/res/linux/supercell-wx.desktop" "$out/share/applications/supercell-wx.desktop"
|
install -m0644 -D "$src/scwx-qt/res/linux/supercell-wx.desktop" "$out/share/applications/supercell-wx.desktop"
|
||||||
install -m0644 -D "$src/scwx-qt/res/icons/scwx-256.png" "$out/share/icons/hicolor/256x256/apps/supercell-wx.png"
|
install -m0644 -D "$src/scwx-qt/res/icons/scwx-256.png" "$out/share/icons/hicolor/256x256/apps/supercell-wx.png"
|
||||||
install -m0644 -D "$src/scwx-qt/res/icons/scwx-64.png" "$out/share/icons/hicolor/64x64/apps/supercell-wx.png"
|
install -m0644 -D "$src/scwx-qt/res/icons/scwx-64.png" "$out/share/icons/hicolor/64x64/apps/supercell-wx.png"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://supercell-wx.rtfd.io";
|
||||||
|
downloadPage = "https://github.com/dpaulat/supercell-wx/releases";
|
||||||
|
description = "Live visualization of NEXRAD weather data and alerts";
|
||||||
|
changelog = "https://github.com/dpaulat/supercell-wx/releases/tag/${finalAttrs.src.tag}";
|
||||||
|
longDescription = ''
|
||||||
|
Supercell Wx is a free, open source application to visualize live and
|
||||||
|
archive NEXRAD Level 2 and Level 3 data, and severe weather alerts.
|
||||||
|
It displays continuously updating weather data on top of a responsive
|
||||||
|
map, providing the capability to monitor weather events using
|
||||||
|
reflectivity, velocity, and other products.
|
||||||
|
'';
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
mainProgram = "supercell-wx";
|
||||||
|
platforms = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
];
|
||||||
|
maintainers = with lib.maintainers; [ aware70 ];
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
||||||
index 47ada181..a1beea15 100644
|
index 36911947..451efc13 100644
|
||||||
--- a/wxdata/wxdata.cmake
|
--- a/wxdata/wxdata.cmake
|
||||||
+++ b/wxdata/wxdata.cmake
|
+++ b/wxdata/wxdata.cmake
|
||||||
@@ -280,6 +280,7 @@ endif()
|
@@ -320,6 +320,7 @@ endif()
|
||||||
|
|
||||||
target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
|
target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
|
||||||
aws-cpp-sdk-s3
|
aws-cpp-sdk-s3
|
||||||
+ aws-crt-cpp
|
+ aws-crt-cpp
|
||||||
cpr::cpr
|
cpr::cpr
|
||||||
LibXml2::LibXml2
|
LibXml2::LibXml2
|
||||||
re2::re2
|
OpenSSL::Crypto
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,24 @@
|
||||||
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
||||||
index cda6c7f..32d807a 100644
|
index 648b6578..4833b9c2 100644
|
||||||
--- a/scwx-qt/scwx-qt.cmake
|
--- a/scwx-qt/scwx-qt.cmake
|
||||||
+++ b/scwx-qt/scwx-qt.cmake
|
+++ b/scwx-qt/scwx-qt.cmake
|
||||||
@@ -601,6 +601,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
@@ -776,6 +776,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
Boost::json
|
|
||||||
Boost::timer
|
Boost::timer
|
||||||
|
Boost::atomic
|
||||||
QMapLibre::Core
|
QMapLibre::Core
|
||||||
+ QMapLibre::Widgets
|
+ QMapLibre::Widgets
|
||||||
$<$<CXX_COMPILER_ID:MSVC>:opengl32>
|
$<$<CXX_COMPILER_ID:MSVC>:opengl32>
|
||||||
|
$<$<CXX_COMPILER_ID:MSVC>:SetupAPI>
|
||||||
Fontconfig::Fontconfig
|
Fontconfig::Fontconfig
|
||||||
GeographicLib::GeographicLib
|
@@ -793,18 +794,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
@@ -615,40 +616,13 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
|
||||||
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
||||||
wxdata)
|
wxdata)
|
||||||
|
|
||||||
-# Set DT_RUNPATH for Linux targets
|
-if (LINUX)
|
||||||
-set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
|
- # Set DT_RUNPATH for Linux targets
|
||||||
-set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
|
- set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
|
||||||
|
- set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
|
||||||
|
-endif()
|
||||||
-
|
-
|
||||||
install(TARGETS supercell-wx
|
install(TARGETS supercell-wx
|
||||||
- MLNQtCore # QMapLibre::Core
|
- MLNQtCore # QMapLibre::Core
|
||||||
|
|
@ -26,7 +28,8 @@ index cda6c7f..32d807a 100644
|
||||||
- "^(/usr)?/lib/.*\\.so(\\..*)?"
|
- "^(/usr)?/lib/.*\\.so(\\..*)?"
|
||||||
RUNTIME
|
RUNTIME
|
||||||
COMPONENT supercell-wx
|
COMPONENT supercell-wx
|
||||||
LIBRARY
|
BUNDLE
|
||||||
|
@@ -819,24 +809,6 @@ install(TARGETS supercell-wx
|
||||||
COMPONENT supercell-wx
|
COMPONENT supercell-wx
|
||||||
OPTIONAL)
|
OPTIONAL)
|
||||||
|
|
||||||
|
|
@ -48,6 +51,6 @@ index cda6c7f..32d807a 100644
|
||||||
-install(SCRIPT ${deploy_script_scwx}
|
-install(SCRIPT ${deploy_script_scwx}
|
||||||
- COMPONENT supercell-wx)
|
- COMPONENT supercell-wx)
|
||||||
-
|
-
|
||||||
if (MSVC)
|
if (APPLE)
|
||||||
set(CPACK_PACKAGE_NAME "Supercell Wx")
|
# Install additional script to fix up the bundle
|
||||||
set(CPACK_PACKAGE_VENDOR "Dan Paulat")
|
install(CODE [[
|
||||||
|
|
|
||||||
27
pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch
Normal file
27
pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
||||||
|
index 648b6578..3f1d8070 100644
|
||||||
|
--- a/scwx-qt/scwx-qt.cmake
|
||||||
|
+++ b/scwx-qt/scwx-qt.cmake
|
||||||
|
@@ -18,7 +18,7 @@ find_package(Fontconfig)
|
||||||
|
find_package(geographiclib)
|
||||||
|
find_package(geos)
|
||||||
|
find_package(glm)
|
||||||
|
-find_package(OpenGL)
|
||||||
|
+find_package(OpenGL REQUIRED)
|
||||||
|
find_package(Python COMPONENTS Interpreter)
|
||||||
|
find_package(SQLite3)
|
||||||
|
|
||||||
|
@@ -759,12 +759,7 @@ if (LINUX)
|
||||||
|
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-if (LINUX)
|
||||||
|
- find_package(mesa-glu REQUIRED)
|
||||||
|
- target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu)
|
||||||
|
-else()
|
||||||
|
- target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
|
||||||
|
-endif()
|
||||||
|
+target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
|
||||||
|
|
||||||
|
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
|
Qt${QT_VERSION_MAJOR}::OpenGLWidgets
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git a/scwx-qt/tools/generate_versions.py b/scwx-qt/tools/generate_versions.py
|
diff --git a/scwx-qt/tools/generate_versions.py b/scwx-qt/tools/generate_versions.py
|
||||||
index c6c94020..3fcdcf08 100644
|
index c6c94020..000f6e6e 100644
|
||||||
--- a/scwx-qt/tools/generate_versions.py
|
--- a/scwx-qt/tools/generate_versions.py
|
||||||
+++ b/scwx-qt/tools/generate_versions.py
|
+++ b/scwx-qt/tools/generate_versions.py
|
||||||
@@ -1,6 +1,5 @@
|
@@ -1,6 +1,5 @@
|
||||||
|
|
@ -9,7 +9,7 @@ index c6c94020..3fcdcf08 100644
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
@@ -110,27 +109,22 @@ def ParseArguments():
|
@@ -110,27 +109,23 @@ def ParseArguments():
|
||||||
required = True)
|
required = True)
|
||||||
return parser.parse_args()
|
return parser.parse_args()
|
||||||
|
|
||||||
|
|
@ -25,7 +25,7 @@ index c6c94020..3fcdcf08 100644
|
||||||
print("Collecting version info")
|
print("Collecting version info")
|
||||||
|
|
||||||
versionInfo = VersionInfo()
|
versionInfo = VersionInfo()
|
||||||
-
|
|
||||||
- repo = git.Repo(args.gitRepo_, search_parent_directories = True)
|
- repo = git.Repo(args.gitRepo_, search_parent_directories = True)
|
||||||
-
|
-
|
||||||
- commitString = str(repo.head.commit)[:10]
|
- commitString = str(repo.head.commit)[:10]
|
||||||
|
|
@ -43,7 +43,7 @@ index c6c94020..3fcdcf08 100644
|
||||||
- versionInfo.copyrightYear_ = copyrightYear
|
- versionInfo.copyrightYear_ = copyrightYear
|
||||||
- versionInfo.resourceDir_ = resourceDir
|
- versionInfo.resourceDir_ = resourceDir
|
||||||
+ versionInfo.commitString_ = "@rev@"
|
+ versionInfo.commitString_ = "@rev@"
|
||||||
+ versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / 'LICENSE.txt')
|
+ versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / "LICENSE.txt")
|
||||||
+ versionInfo.resourceDir_ = str(args.gitRepo_).replace("\\", "\\\\")
|
+ versionInfo.resourceDir_ = str(args.gitRepo_).replace("\\", "\\\\")
|
||||||
versionInfo.versionString_ = args.version_
|
versionInfo.versionString_ = args.version_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,63 +1,63 @@
|
||||||
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||||
index 2137ae62..041cb87d 100644
|
index 1039e96e..16f2c84a 100644
|
||||||
--- a/external/CMakeLists.txt
|
--- a/external/CMakeLists.txt
|
||||||
+++ b/external/CMakeLists.txt
|
+++ b/external/CMakeLists.txt
|
||||||
@@ -14,7 +14,7 @@ set_property(DIRECTORY
|
@@ -15,7 +15,7 @@ set_property(DIRECTORY
|
||||||
units.cmake
|
units.cmake
|
||||||
qt6ct.cmake)
|
qt6ct.cmake)
|
||||||
|
|
||||||
-include(aws-sdk-cpp.cmake)
|
-include(aws-sdk-cpp.cmake)
|
||||||
+find_package(AWSSDK CONFIG REQUIRED)
|
+find_package(AWSSDK CONFIG REQUIRED)
|
||||||
include(date.cmake)
|
include(date.cmake)
|
||||||
|
include(glad.cmake)
|
||||||
include(hsluv-c.cmake)
|
include(hsluv-c.cmake)
|
||||||
include(imgui.cmake)
|
|
||||||
diff --git a/external/stb.cmake b/external/stb.cmake
|
diff --git a/external/stb.cmake b/external/stb.cmake
|
||||||
index 570af425..f9817226 100644
|
index 570af425..f2e7b2c8 100644
|
||||||
--- a/external/stb.cmake
|
--- a/external/stb.cmake
|
||||||
+++ b/external/stb.cmake
|
+++ b/external/stb.cmake
|
||||||
@@ -1,4 +1,3 @@
|
@@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.24)
|
cmake_minimum_required(VERSION 3.24)
|
||||||
set(PROJECT_NAME scwx-stb)
|
set(PROJECT_NAME scwx-stb)
|
||||||
|
|
||||||
-set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
|
-set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
|
||||||
+# Nix: set STB_INCLUDE_DIR in cmake flags
|
+# Nix: set STB_INCLUDE_DIR in cmake flags
|
||||||
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
|
||||||
index 09ea6fe3..c20a2cb6 100644
|
index 4833b9c2..641fc637 100644
|
||||||
--- a/scwx-qt/scwx-qt.cmake
|
--- a/scwx-qt/scwx-qt.cmake
|
||||||
+++ b/scwx-qt/scwx-qt.cmake
|
+++ b/scwx-qt/scwx-qt.cmake
|
||||||
@@ -11,14 +11,15 @@ set(CMAKE_AUTORCC ON)
|
@@ -13,14 +13,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
OPTION(SCWX_DISABLE_CONSOLE "Disables the Windows console in release mode" ON)
|
||||||
|
|
||||||
-find_package(Boost)
|
-find_package(Boost)
|
||||||
+find_package(Boost REQUIRED COMPONENTS json timer)
|
+find_package(Boost REQUIRED COMPONENTS json timer atomic)
|
||||||
find_package(Fontconfig)
|
find_package(Fontconfig)
|
||||||
-find_package(geographiclib)
|
-find_package(geographiclib)
|
||||||
+find_package(GeographicLib)
|
+find_package(GeographicLib)
|
||||||
find_package(geos)
|
find_package(geos)
|
||||||
find_package(GLEW)
|
|
||||||
find_package(glm)
|
find_package(glm)
|
||||||
|
find_package(OpenGL)
|
||||||
find_package(Python COMPONENTS Interpreter)
|
find_package(Python COMPONENTS Interpreter)
|
||||||
find_package(SQLite3)
|
find_package(SQLite3)
|
||||||
+find_package(PNG)
|
+find_package(PNG)
|
||||||
|
|
||||||
find_package(QT NAMES Qt6
|
find_package(QT NAMES Qt6
|
||||||
COMPONENTS Gui
|
COMPONENTS Gui
|
||||||
@@ -699,6 +700,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
@@ -789,6 +790,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
|
||||||
imgui
|
|
||||||
qt6ct-common
|
qt6ct-common
|
||||||
|
qt6ct-widgets
|
||||||
SQLite::SQLite3
|
SQLite::SQLite3
|
||||||
+ PNG::PNG
|
+ PNG::PNG
|
||||||
wxdata)
|
wxdata)
|
||||||
|
|
||||||
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
target_link_libraries(supercell-wx PRIVATE scwx-qt
|
||||||
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
|
||||||
index 94b0e3a7..a36c2c81 100644
|
index 451efc13..86cbb42b 100644
|
||||||
--- a/wxdata/wxdata.cmake
|
--- a/wxdata/wxdata.cmake
|
||||||
+++ b/wxdata/wxdata.cmake
|
+++ b/wxdata/wxdata.cmake
|
||||||
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.24)
|
@@ -4,7 +4,8 @@ project(scwx-data)
|
||||||
|
|
||||||
project(scwx-data)
|
include(CheckCXXSymbolExists)
|
||||||
|
|
||||||
-find_package(Boost)
|
-find_package(Boost)
|
||||||
+find_package(Boost REQUIRED COMPONENTS iostreams)
|
+find_package(Boost REQUIRED COMPONENTS iostreams)
|
||||||
|
|
|
||||||
|
|
@ -36,13 +36,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "SwayNotificationCenter";
|
pname = "SwayNotificationCenter";
|
||||||
version = "0.12.2";
|
version = "0.12.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ErikReider";
|
owner = "ErikReider";
|
||||||
repo = "SwayNotificationCenter";
|
repo = "SwayNotificationCenter";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-BtcT2N08BVxVrzEd1Z/s5MXWHaHFt6PqBH4gdH6TEvs=";
|
hash = "sha256-8zVG3mJxT6K0jkqsnaJ4wscPAk3z00YTsmHsJmuKWc8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# build pkg-config is required to locate the native `scdoc` input
|
# build pkg-config is required to locate the native `scdoc` input
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage (finalAttrs: {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "sydbox";
|
pname = "sydbox";
|
||||||
version = "3.41.4";
|
version = "3.42.0";
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
"out"
|
"out"
|
||||||
|
|
@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
owner = "Sydbox";
|
owner = "Sydbox";
|
||||||
repo = "sydbox";
|
repo = "sydbox";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-RILehKm5DzhCLfhGRUuoXYmrpO/b5TSTnzrVNvhSNrg=";
|
hash = "sha256-mp1FGJpwCYU53nK9sHjy17vIeR0ewst5eF0OA4Pfcl4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-t9p4RDQnz/C5TLgbDug3vnod+osY7oEPtW+dNzz9pEE=";
|
cargoHash = "sha256-15w2b9kRhDYXjUfKSULXFWzeD60Qmz4ATKEtaDwiDOo=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
mandoc
|
mandoc
|
||||||
|
|
|
||||||
|
|
@ -3,18 +3,18 @@
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
pname = "tarts";
|
pname = "tarts";
|
||||||
version = "0.1.16-unstable-2025-05-04";
|
version = "0.1.24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "oiwn";
|
owner = "oiwn";
|
||||||
repo = "tarts";
|
repo = "tarts";
|
||||||
rev = "8560a63dda8e5ffd5fdd96a1f7687f8f12d36022";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-d06FL0khcI2LUMbrUo3tmQn97pNFIVefPWlxWFSUJ+E=";
|
hash = "sha256-whkDHgxrHkmYX6hji+z8mc964lQxllaidV8clJhvDqw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-DLIBVl7CzhEYjAnkJmLHSlUoXCNos8YPHfSz9rs99/8=";
|
cargoHash = "sha256-IZyjwbx7V0kPkmD9r8qrqp4nrJg8g6tepw5bvWlLZBE=";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Screen saves and visual effects for your terminal";
|
description = "Screen saves and visual effects for your terminal";
|
||||||
|
|
@ -23,4 +23,4 @@ rustPlatform.buildRustPackage {
|
||||||
maintainers = [ lib.maintainers.da157 ];
|
maintainers = [ lib.maintainers.da157 ];
|
||||||
mainProgram = "tarts";
|
mainProgram = "tarts";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,11 @@
|
||||||
libjpeg,
|
libjpeg,
|
||||||
libtiff,
|
libtiff,
|
||||||
libpng,
|
libpng,
|
||||||
gtk2,
|
gtk2-x11,
|
||||||
libpaper,
|
libpaper,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
ghostscript,
|
ghostscript,
|
||||||
|
libXft,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
|
url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz";
|
||||||
sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z";
|
hash = "sha256-P6mSwryWrzyniO+UHLUxT0odhDIC79AgG4tO6a2/MWw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
@ -56,6 +57,8 @@ stdenv.mkDerivation rec {
|
||||||
"compile.shared"
|
"compile.shared"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
|
|
@ -91,11 +94,12 @@ stdenv.mkDerivation rec {
|
||||||
libjpeg
|
libjpeg
|
||||||
libtiff
|
libtiff
|
||||||
libpng
|
libpng
|
||||||
gtk2
|
gtk2-x11
|
||||||
libpaper
|
libpaper
|
||||||
|
libXft
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Easy rich text processor";
|
description = "Easy rich text processor";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Ted is a text processor running under X Windows on Unix/Linux systems.
|
Ted is a text processor running under X Windows on Unix/Linux systems.
|
||||||
|
|
@ -109,10 +113,9 @@ stdenv.mkDerivation rec {
|
||||||
MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to
|
MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to
|
||||||
Acrobat PDF converter.
|
Acrobat PDF converter.
|
||||||
'';
|
'';
|
||||||
homepage = "https://nllgg.nl/Ted/";
|
homepage = "https://ftp.nluug.nl/pub/editors/ted/";
|
||||||
license = licenses.gpl2Only;
|
license = lib.licenses.gpl2Only;
|
||||||
platforms = platforms.all;
|
platforms = lib.platforms.all;
|
||||||
broken = stdenv.hostPlatform.isDarwin;
|
maintainers = with lib.maintainers; [ obadz ];
|
||||||
maintainers = with maintainers; [ obadz ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,13 +16,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "typescript-language-server";
|
pname = "typescript-language-server";
|
||||||
version = "5.1.0";
|
version = "5.1.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "typescript-language-server";
|
owner = "typescript-language-server";
|
||||||
repo = "typescript-language-server";
|
repo = "typescript-language-server";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-MpcTyjew/SgmWrpeqXLjQPPdwUuMTWQYyyM9TG5jNbQ=";
|
hash = "sha256-wYpW/HHuMetxnwEgGeQ8ptT6Kd5wp2kqUXnjWSkoDQY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,16 @@
|
||||||
|
|
||||||
buildNpmPackage (finalAttrs: {
|
buildNpmPackage (finalAttrs: {
|
||||||
pname = "vsce";
|
pname = "vsce";
|
||||||
version = "3.6.2";
|
version = "3.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "microsoft";
|
owner = "microsoft";
|
||||||
repo = "vscode-vsce";
|
repo = "vscode-vsce";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-TcBzXDNpjJvI+0ir80d+HFp6mF/Ecle4vhOMcACvF7M=";
|
hash = "sha256-dNSO+PoUNQUtvS6NZJ/InOYqI4vav+WNg6kCA+CaWL8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-G09pn6JX389GMbIzYmmLutH7qwiaDb8V9zCGAOFaDdk=";
|
npmDepsHash = "sha256-rqwb1bz/OFHzL8GgqMZtuqYkeST5qlFybDRSFOx7LtU=";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'
|
substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ let
|
||||||
in
|
in
|
||||||
python.pkgs.buildPythonApplication rec {
|
python.pkgs.buildPythonApplication rec {
|
||||||
pname = "weblate";
|
pname = "weblate";
|
||||||
version = "5.14";
|
version = "5.14.3";
|
||||||
|
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
|
|
@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
owner = "WeblateOrg";
|
owner = "WeblateOrg";
|
||||||
repo = "weblate";
|
repo = "weblate";
|
||||||
tag = "weblate-${version}";
|
tag = "weblate-${version}";
|
||||||
hash = "sha256-XIaVM9bsgv6qJ1Q/6wzfO7D04WsUEkxNnJlyLd5+bY4=";
|
hash = "sha256-DwoJ24yGLJt+bItN/9SW0ruf+Lz3A9JxvD4QjlKaqzw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python.pkgs; [ setuptools ];
|
build-system = with python.pkgs; [ setuptools ];
|
||||||
|
|
@ -176,5 +176,6 @@ python.pkgs.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
maintainers = with lib.maintainers; [ erictapen ];
|
maintainers = with lib.maintainers; [ erictapen ];
|
||||||
|
mainProgram = "weblate";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,9 @@
|
||||||
gtk2,
|
gtk2,
|
||||||
python3,
|
python3,
|
||||||
game-music-emu,
|
game-music-emu,
|
||||||
|
copyDesktopItems,
|
||||||
|
makeDesktopItem,
|
||||||
|
imagemagick,
|
||||||
serverOnly ? false,
|
serverOnly ? false,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -72,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
makeWrapper
|
||||||
python3
|
python3
|
||||||
|
copyDesktopItems
|
||||||
|
imagemagick
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
@ -93,8 +98,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
desktopItems = [
|
||||||
|
(makeDesktopItem {
|
||||||
|
name = "zandronum";
|
||||||
|
desktopName = "Zandronum";
|
||||||
|
exec = "zandronum";
|
||||||
|
icon = "zandronum";
|
||||||
|
mimeTypes = [ "application/x-doom-wad" ];
|
||||||
|
categories = [ "Game" ];
|
||||||
|
comment = finalAttrs.meta.description;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead
|
# Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
mkdir -p $out/lib/zandronum
|
mkdir -p $out/lib/zandronum
|
||||||
cp zandronum${suffix} \
|
cp zandronum${suffix} \
|
||||||
|
|
@ -104,6 +123,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}
|
makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix}
|
||||||
wrapProgram $out/bin/zandronum${suffix} \
|
wrapProgram $out/bin/zandronum${suffix} \
|
||||||
--set LC_ALL="C"
|
--set LC_ALL="C"
|
||||||
|
|
||||||
|
# Upstream only provides an icon file for Windows.
|
||||||
|
# This converts the .ico file to PNGs, which are used by the desktop file.
|
||||||
|
for size in 16 24 32 48 64 128 256; do
|
||||||
|
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||||
|
magick $src/src/win32/zandronum.ico -background none -resize "$size"x"$size" -flatten \
|
||||||
|
$out/share/icons/hicolor/"$size"x"$size"/apps/zandronum.png
|
||||||
|
done;
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = lib.optionalString (!serverOnly) ''
|
postFixup = lib.optionalString (!serverOnly) ''
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
genericBuilder:
|
genericBuilder:
|
||||||
|
|
||||||
genericBuilder {
|
genericBuilder {
|
||||||
version = "26.2.5.15";
|
version = "26.2.5.16";
|
||||||
hash = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE=";
|
hash = "sha256-3WxURI1o/CqN0KK+voUMk6al2mtsrqoniBJpDxKpxPo=";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
genericBuilder:
|
genericBuilder:
|
||||||
|
|
||||||
genericBuilder {
|
genericBuilder {
|
||||||
version = "27.3.4.4";
|
version = "27.3.4.5";
|
||||||
hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM=";
|
hash = "sha256-6kFixIy74ACvNBhPWoUQDCH6N2KJ++5xAEqPQ9jvJ8o=";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -164,6 +164,7 @@ stdenv.mkDerivation {
|
||||||
homepage = "https://www.erlang.org/";
|
homepage = "https://www.erlang.org/";
|
||||||
downloadPage = "https://www.erlang.org/download.html";
|
downloadPage = "https://www.erlang.org/download.html";
|
||||||
description = "Programming language used for massively scalable soft real-time systems";
|
description = "Programming language used for massively scalable soft real-time systems";
|
||||||
|
changelog = "https://github.com/erlang/otp/releases/tag/OTP-${version}";
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Erlang is a programming language used to build massively scalable
|
Erlang is a programming language used to build massively scalable
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioamazondevices";
|
pname = "aioamazondevices";
|
||||||
version = "6.5.6";
|
version = "8.0.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chemelli74";
|
owner = "chemelli74";
|
||||||
repo = "aioamazondevices";
|
repo = "aioamazondevices";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-OgcOsRKqSU3k4myfHmOYaXW259LDgYWj0gXPLwabVIM=";
|
hash = "sha256-q8wmBBXZSu69BAZ1wY4/tlW/usiWwlwVCnAEOOZs5TE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
# wrapped to be able to find aioconsole and any other packages.
|
# wrapped to be able to find aioconsole and any other packages.
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "aioconsole";
|
pname = "aioconsole";
|
||||||
version = "0.8.1";
|
version = "0.8.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||||
owner = "vxgmichel";
|
owner = "vxgmichel";
|
||||||
repo = "aioconsole";
|
repo = "aioconsole";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs=";
|
hash = "sha256-j4nzt8mvn+AYObh1lvgxS8wWK662KN+OxjJ2b5ZNAcQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "apscheduler";
|
pname = "apscheduler";
|
||||||
version = "3.11.0";
|
version = "3.11.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||||
owner = "agronholm";
|
owner = "agronholm";
|
||||||
repo = "apscheduler";
|
repo = "apscheduler";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w=";
|
hash = "sha256-3KSW1RdiUXlDTr30Wrc8fYb4rRnlOn6lVhBgz3r1D/4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
@ -69,10 +69,11 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
pythonImportsCheck = [ "apscheduler" ];
|
pythonImportsCheck = [ "apscheduler" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
|
changelog = "https://github.com/agronholm/apscheduler/releases/tag/${src.tag}";
|
||||||
description = "Library that lets you schedule your Python code to be executed";
|
description = "Library that lets you schedule your Python code to be executed";
|
||||||
homepage = "https://github.com/agronholm/apscheduler";
|
homepage = "https://github.com/agronholm/apscheduler";
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,19 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
pytest-cov-stub,
|
pytest-cov-stub,
|
||||||
pytestCheckHook,
|
pytestCheckHook,
|
||||||
pythonOlder,
|
|
||||||
setuptools-scm,
|
setuptools-scm,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "asteval";
|
pname = "asteval";
|
||||||
version = "1.0.6";
|
version = "1.0.7";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lmfit";
|
owner = "lmfit";
|
||||||
repo = "asteval";
|
repo = "asteval";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-DzLVe8TlWAPQXzai9CJlDAow6UTSmkA/DW3fT30YfZY=";
|
hash = "sha256-c+gVT947IpJC2gn1SWVth0ScOBh34m89dpgR5AikOHk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools-scm ];
|
build-system = [ setuptools-scm ];
|
||||||
|
|
@ -39,7 +36,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "AST evaluator of Python expression using ast module";
|
description = "AST evaluator of Python expression using ast module";
|
||||||
homepage = "https://github.com/lmfit/asteval";
|
homepage = "https://github.com/lmfit/asteval";
|
||||||
changelog = "https://github.com/lmfit/asteval/releases/tag/${version}";
|
changelog = "https://github.com/lmfit/asteval/releases/tag/${src.tag}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "azure-storage-queue";
|
pname = "azure-storage-queue";
|
||||||
version = "12.14.0";
|
version = "12.14.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "azure_storage_queue";
|
pname = "azure_storage_queue";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-WIhM62wQqF3NIuOJreMr46bzbsWHxC5O/AZO/D7yV0M=";
|
hash = "sha256-j3r7MR7xuZBzFuWbs+BkU5fI12BzrbG1lfAnsXwLevE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
||||||
|
|
@ -358,13 +358,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boto3-stubs";
|
pname = "boto3-stubs";
|
||||||
version = "1.40.64";
|
version = "1.40.69";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "boto3_stubs";
|
pname = "boto3_stubs";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-r0p/tnvaDBJ3r81FolBlYFVn0mCor9NLvfF5nSSSM08=";
|
hash = "sha256-JEEhZyxhS1hCbxYw9Whagh9KjP9J3u1ZoofZ2Rx6TWQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue