mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-23 17:12:27 +00:00
Compare commits
248 Commits
staging
...
haskell-up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7632f2c418 | ||
|
|
eef2380c20 | ||
|
|
e3c24ee8db | ||
|
|
116208d9cf | ||
|
|
a332844436 | ||
|
|
86ed8342de | ||
|
|
31f495afe9 | ||
|
|
da941382a6 | ||
|
|
920b50911d | ||
|
|
43159787fd | ||
|
|
a603053a30 | ||
|
|
5865c4be2c | ||
|
|
b72ec6bdee | ||
|
|
c818fb7e53 | ||
|
|
88daa4b688 | ||
|
|
d82c0d269e | ||
|
|
0b6b59708c | ||
|
|
9220258efb | ||
|
|
a8560ee995 | ||
|
|
cfdc80cdd7 | ||
|
|
523ffbe971 | ||
|
|
3aed88a715 | ||
|
|
1c3465fcb7 | ||
|
|
54112f9a6b | ||
|
|
92cbc9ca81 | ||
|
|
6a3c990a99 | ||
|
|
39ee207b1d | ||
|
|
d64edb78f9 | ||
|
|
54726cb9e3 | ||
|
|
b7659cdb62 | ||
|
|
bcf85400c4 | ||
|
|
e3927c07f7 | ||
|
|
8486e8a7b3 | ||
|
|
4f0970401a | ||
|
|
9959ce2f44 | ||
|
|
3f085fe61c | ||
|
|
f61423d87c | ||
|
|
4aeebf57da | ||
|
|
4c7647a6d3 | ||
|
|
afda14f1d4 | ||
|
|
e9af2ed4be | ||
|
|
2735e861f0 | ||
|
|
92ca07b6a5 | ||
|
|
e82d6b924f | ||
|
|
94aa8f8960 | ||
|
|
75496eb67a | ||
|
|
9c55dbeccf | ||
|
|
cef090d1ab | ||
|
|
4132fb9736 | ||
|
|
98c655c09a | ||
|
|
3f49232af6 | ||
|
|
7100632254 | ||
|
|
b078be0041 | ||
|
|
92779d4478 | ||
|
|
070e7a021f | ||
|
|
71b5964ed6 | ||
|
|
00a35c51c7 | ||
|
|
dbd129b241 | ||
|
|
26066e1e2b | ||
|
|
60f1d07046 | ||
|
|
a5e06de0c4 | ||
|
|
8833922b3e | ||
|
|
d0e8fdd1bd | ||
|
|
9122c84035 | ||
|
|
f479cbacab | ||
|
|
f87fabdc91 | ||
|
|
f94cecf640 | ||
|
|
fc0932307c | ||
|
|
ffbec19b05 | ||
|
|
435e7264b6 | ||
|
|
480f0726e7 | ||
|
|
4d0ae93287 | ||
|
|
81ef0ce73b | ||
|
|
24211dd381 | ||
|
|
8b99224c3e | ||
|
|
d56383f426 | ||
|
|
2836c4b1f4 | ||
|
|
16a3b0c7d9 | ||
|
|
7db16b7a40 | ||
|
|
85b5c86354 | ||
|
|
3f6c25ad80 | ||
|
|
a8988fede0 | ||
|
|
68f69e8b05 | ||
|
|
9bbb567bb9 | ||
|
|
5f8a3af9eb | ||
|
|
b25e3e8489 | ||
|
|
a220c38f46 | ||
|
|
fdbcfd8b47 | ||
|
|
eff6c0e60e | ||
|
|
5a03008b47 | ||
|
|
6dd4da168b | ||
|
|
4cbc2251c7 | ||
|
|
a8233a24e1 | ||
|
|
da4f3989f0 | ||
|
|
e0497b3d10 | ||
|
|
a49c815e3d | ||
|
|
f213d6af36 | ||
|
|
aba749b3bb | ||
|
|
e64658550c | ||
|
|
07d2edc929 | ||
|
|
b52ea84a40 | ||
|
|
f394a62a65 | ||
|
|
ad66699b02 | ||
|
|
084d450fa7 | ||
|
|
ec138222f7 | ||
|
|
5a13f175d1 | ||
|
|
117625921f | ||
|
|
2c44031fe0 | ||
|
|
d34ba4d817 | ||
|
|
e34ce374a1 | ||
|
|
a00be59a94 | ||
|
|
ab20ff9b2f | ||
|
|
995d34a153 | ||
|
|
9208b19946 | ||
|
|
9029909ba3 | ||
|
|
b82be3afe6 | ||
|
|
248b70dc3b | ||
|
|
0baca65faa | ||
|
|
b1528a1baf | ||
|
|
200316c491 | ||
|
|
3c4f10205c | ||
|
|
827c840fb1 | ||
|
|
095f6729ca | ||
|
|
1352e67378 | ||
|
|
0814616eaf | ||
|
|
f70431ea67 | ||
|
|
8383c3f904 | ||
|
|
cac8c10692 | ||
|
|
739281cf7a | ||
|
|
ef5a2561e3 | ||
|
|
a5f1afdf0f | ||
|
|
cbe86ed815 | ||
|
|
5617c0ba47 | ||
|
|
caf8327196 | ||
|
|
89b9cdcbba | ||
|
|
3c3354afa3 | ||
|
|
8cc9c34bcb | ||
|
|
8c3d964e79 | ||
|
|
cadaf97e4e | ||
|
|
593c21a56a | ||
|
|
6306c15610 | ||
|
|
884892c2c1 | ||
|
|
627dd785ad | ||
|
|
180157dfa4 | ||
|
|
0d1190abf7 | ||
|
|
c24d964453 | ||
|
|
9ec4c8e1b6 | ||
|
|
b32a192bcf | ||
|
|
338f88c94a | ||
|
|
a262ae9474 | ||
|
|
9f367b9af0 | ||
|
|
9227423f57 | ||
|
|
79b85a6061 | ||
|
|
07837352f5 | ||
|
|
422b020e60 | ||
|
|
d58b43bad8 | ||
|
|
e4e45c45d7 | ||
|
|
a0811c1859 | ||
|
|
41dec8b399 | ||
|
|
4b9529d490 | ||
|
|
eca559367a | ||
|
|
d217b14de6 | ||
|
|
5aafdde3a0 | ||
|
|
9eb68607ef | ||
|
|
430963bdf1 | ||
|
|
4ca20a7582 | ||
|
|
39ad1cb021 | ||
|
|
6ad984ce3d | ||
|
|
8b0587a6d1 | ||
|
|
668847dd15 | ||
|
|
40f0c70593 | ||
|
|
265fda252f | ||
|
|
e1eeed9ea6 | ||
|
|
d3928686c3 | ||
|
|
fb629a8712 | ||
|
|
1fa9545db7 | ||
|
|
7b203a8cdf | ||
|
|
3080e495c5 | ||
|
|
41a68a1180 | ||
|
|
2c84961290 | ||
|
|
eb378a86bf | ||
|
|
b8880df8ac | ||
|
|
79a87d6750 | ||
|
|
61b9e0b5f4 | ||
|
|
2cb1137ad8 | ||
|
|
dc341cc322 | ||
|
|
7ef227eef6 | ||
|
|
df2259de34 | ||
|
|
fbfe792c92 | ||
|
|
18c743b5c9 | ||
|
|
1912d24658 | ||
|
|
8b3bed966a | ||
|
|
8ca5572327 | ||
|
|
f1cd3a542b | ||
|
|
28ea7d3e94 | ||
|
|
015d2be85f | ||
|
|
dcd5f66215 | ||
|
|
c990defdc1 | ||
|
|
ef80ea96c0 | ||
|
|
70b3bb6148 | ||
|
|
9f87b41bbc | ||
|
|
9eab5d0982 | ||
|
|
31b3654bd0 | ||
|
|
fd7118d37f | ||
|
|
3f0c2996b0 | ||
|
|
58545c6507 | ||
|
|
bd20e4d544 | ||
|
|
40fdae7a02 | ||
|
|
4dfddc5e2d | ||
|
|
a42cf3de47 | ||
|
|
98472212df | ||
|
|
1166f6d5fe | ||
|
|
3100f81d11 | ||
|
|
cfae19b0e2 | ||
|
|
4c79be7954 | ||
|
|
a5d168008d | ||
|
|
8960ba3747 | ||
|
|
4bac4c007b | ||
|
|
449e33902d | ||
|
|
cfb525e8c7 | ||
|
|
90e108c717 | ||
|
|
a9c7731b36 | ||
|
|
0e972a63ef | ||
|
|
db6cdf8674 | ||
|
|
83742b85ed | ||
|
|
7fe7f911c5 | ||
|
|
379b9966b6 | ||
|
|
8e147a7423 | ||
|
|
e78b52efb2 | ||
|
|
9db26c0d78 | ||
|
|
44c90f8b11 | ||
|
|
6ae08b4b8c | ||
|
|
e71086f1ad | ||
|
|
a9a7b4af3b | ||
|
|
6e6ee420cc | ||
|
|
4f5821131d | ||
|
|
7c90da01b9 | ||
|
|
87258e4b4c | ||
|
|
07855b2421 | ||
|
|
0ec79f0885 | ||
|
|
9adad48243 | ||
|
|
2e0690adfb | ||
|
|
e9724bc92f | ||
|
|
3b2f54505e | ||
|
|
5498d6a4fe | ||
|
|
b0f9043b9f | ||
|
|
fcd62a690f | ||
|
|
fe8e3efa4f |
@@ -15629,12 +15629,6 @@
|
||||
githubId = 632767;
|
||||
name = "Guillaume Maudoux";
|
||||
};
|
||||
layzyoldman = {
|
||||
email = "ricardopaivacampos@gmail.com";
|
||||
github = "layzyoldman";
|
||||
githubId = 193278607;
|
||||
name = "Ricardo Campos";
|
||||
};
|
||||
LazilyStableProton = {
|
||||
email = "LazilyStable@proton.me";
|
||||
github = "LazyStability";
|
||||
@@ -19316,12 +19310,6 @@
|
||||
githubId = 220262;
|
||||
name = "Ion Mudreac";
|
||||
};
|
||||
mugaizzo = {
|
||||
email = "mugahedman@hotmail.com";
|
||||
github = "mugaizzo";
|
||||
githubId = 15838537;
|
||||
name = "Mugahed Izzeldin";
|
||||
};
|
||||
mulatta = {
|
||||
email = "seungwon@mulatta.io";
|
||||
github = "mulatta";
|
||||
@@ -19819,12 +19807,6 @@
|
||||
githubId = 364510;
|
||||
name = "Tobias Geerinckx-Rice";
|
||||
};
|
||||
ndavd = {
|
||||
email = "email@ndavd.com";
|
||||
github = "ndavd";
|
||||
githubId = 74260683;
|
||||
name = "Nuno David";
|
||||
};
|
||||
ndl = {
|
||||
email = "ndl@endl.ch";
|
||||
github = "ndl";
|
||||
@@ -30909,11 +30891,6 @@
|
||||
githubId = 106241330;
|
||||
name = "Success Kingsley";
|
||||
};
|
||||
xqtc161 = {
|
||||
github = "xqtc161";
|
||||
githubId = 65857432;
|
||||
name = "tila";
|
||||
};
|
||||
xrelkd = {
|
||||
github = "xrelkd";
|
||||
githubId = 46590321;
|
||||
|
||||
39
maintainers/scripts/haskell/eval-pkg-sets.sh
Executable file
39
maintainers/scripts/haskell/eval-pkg-sets.sh
Executable file
@@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash
|
||||
#!nix-shell -p jq git
|
||||
# shellcheck shell=bash
|
||||
#
|
||||
# Usage: eval-pkg-sets.sh [extra flags for nix-* commands ...]
|
||||
#
|
||||
# Must be executed in a git checkout of Nixpkgs.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
NIXPKGS="$(git rev-parse --show-toplevel)"
|
||||
PKGSETS="$(nix-env --readonly-mode --json --drv-path -f "$NIXPKGS" -qaP -A haskell.compiler "$@" \
|
||||
| jq -r 'to_entries | unique_by(.value.drvPath) .[] .key | sub("^haskell.compiler";"haskell.packages")')"
|
||||
|
||||
trap 'exit 1' SIGINT SIGTERM
|
||||
|
||||
set +e
|
||||
|
||||
badsets=""
|
||||
for set in $PKGSETS; do
|
||||
# Confirm an equivalent package set to haskell.compiler.$entry exists and is usable
|
||||
if ! nix-instantiate --readonly-mode -A "$set.ghc" "$@" > /dev/null 2>&1; then
|
||||
echo "Skipping $set... ($set.ghc does not evaluate)"
|
||||
else
|
||||
echo "Evaluating $set..."
|
||||
|
||||
if ! nix-env --readonly-mode -f "$NIXPKGS" -qaP --drv-path -A "$set" "$@" > /dev/null; then
|
||||
badsets+="$set "
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$badsets" ]; then
|
||||
echo "Found potential eval issues in the following sets:" >&2
|
||||
# shellcheck disable=SC2086
|
||||
printf '%s\n' $badsets
|
||||
exit 1
|
||||
fi
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
|
||||
# Stackage solver to use, LTS or Nightly
|
||||
# (should be capitalized like the display name)
|
||||
SOLVER=LTS
|
||||
SOLVER=Nightly
|
||||
# Stackage solver verson, if any. Use latest if empty
|
||||
VERSION=
|
||||
TMP_TEMPLATE=update-stackage.XXXXXXX
|
||||
@@ -105,6 +105,7 @@ sed -r \
|
||||
-e '/ hledger-ui /d' \
|
||||
-e '/ hledger-web /d' \
|
||||
-e '/ spacecookie /d' \
|
||||
-e '/ hnix-store-core /d' \
|
||||
< "${tmpfile_new}" >> $stackage_config
|
||||
# Explanations:
|
||||
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
|
||||
|
||||
@@ -77,12 +77,6 @@
|
||||
|
||||
- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
|
||||
|
||||
- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module.
|
||||
Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals.
|
||||
|
||||
If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal
|
||||
definitions, add the package providing them to `xdg.portal.extraPortals`.
|
||||
|
||||
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
|
||||
|
||||
- `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in.
|
||||
|
||||
@@ -150,6 +150,7 @@ in
|
||||
|
||||
sessionVariables = {
|
||||
NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1";
|
||||
NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals";
|
||||
};
|
||||
|
||||
etc = lib.concatMapAttrs (
|
||||
|
||||
@@ -8,7 +8,6 @@ let
|
||||
inherit (builtins) isList;
|
||||
inherit (lib)
|
||||
concatMapStrings
|
||||
escapeShellArg
|
||||
literalExpression
|
||||
maintainers
|
||||
mapAttrs'
|
||||
@@ -35,7 +34,7 @@ let
|
||||
else if isBool value then
|
||||
boolToString value
|
||||
else
|
||||
escapeShellArg (toString value);
|
||||
toString value;
|
||||
in
|
||||
{
|
||||
options.programs.bat = {
|
||||
|
||||
@@ -33,11 +33,7 @@ let
|
||||
;
|
||||
cfg = config.services.jellyfin;
|
||||
filteredDecodingCodecs = builtins.filter (
|
||||
c:
|
||||
c != "hevc10bit"
|
||||
&& c != "hevcRExt10bit"
|
||||
&& c != "hevcRExt12bit"
|
||||
&& cfg.transcoding.hardwareDecodingCodecs.${c}
|
||||
c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c}
|
||||
) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs);
|
||||
encodingXmlText = ''
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
@@ -62,7 +58,6 @@ let
|
||||
<AllowAv1Encoding>${boolToString cfg.transcoding.hardwareEncodingCodecs.av1}</AllowAv1Encoding>
|
||||
<EnableIntelLowPowerH264HwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerH264HwEncoder>
|
||||
<EnableIntelLowPowerHevcHwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerHevcHwEncoder>
|
||||
<EnableDecodingColorDepth10Hevc>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit}</EnableDecodingColorDepth10Hevc>
|
||||
<EnableDecodingColorDepth10HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit}</EnableDecodingColorDepth10HevcRext>
|
||||
<EnableDecodingColorDepth12HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit}</EnableDecodingColorDepth12HevcRext>
|
||||
<HardwareDecodingCodecs>
|
||||
|
||||
@@ -30,8 +30,9 @@ let
|
||||
|
||||
dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries;
|
||||
|
||||
transformSettings = settings: {
|
||||
Resolve = lib.mapAttrs (
|
||||
transformSettings =
|
||||
settings:
|
||||
lib.mapAttrs (
|
||||
key: value:
|
||||
# concat lists for options that should result in space-separated values
|
||||
if
|
||||
@@ -45,8 +46,7 @@ let
|
||||
concatStringsSep " " value
|
||||
else
|
||||
value
|
||||
) settings.Resolve;
|
||||
};
|
||||
) settings;
|
||||
|
||||
resolvedConf = settingsToSections (transformSettings cfg.settings);
|
||||
in
|
||||
|
||||
@@ -31,6 +31,6 @@
|
||||
assert ("Latitude: 12.345000°" in whereAmI), f"Incorrect latitude in:\n{whereAmI}"
|
||||
assert ("Longitude: -67.890000°" in whereAmI), f"Incorrect longitude in:\n{whereAmI}"
|
||||
assert ("Altitude: 123.450000 meters" in whereAmI), f"Incorrect altitude in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000.000000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
hardwareDecodingCodecs = {
|
||||
h264 = true;
|
||||
hevc = true;
|
||||
hevc10bit = true;
|
||||
vp9 = true;
|
||||
hevcRExt10bit = true;
|
||||
hevcRExt12bit = true;
|
||||
@@ -175,8 +174,7 @@
|
||||
assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'"
|
||||
assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'"
|
||||
|
||||
# HEVC color depth verification
|
||||
assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'"
|
||||
# HEVC RExt color depth verification
|
||||
assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'"
|
||||
assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'"
|
||||
|
||||
|
||||
@@ -460,17 +460,19 @@ in
|
||||
nodes.machine = common;
|
||||
|
||||
testScript =
|
||||
let
|
||||
oldVersion = "222";
|
||||
in
|
||||
# python
|
||||
''
|
||||
machine.succeed("mount -o remount,rw /boot")
|
||||
|
||||
def switch():
|
||||
# Replace version inside sd-boot with something older. See SD_MAGIC in systemd src/boot/boot.c
|
||||
# Note: the sed replacement has to be length-preserving, because section length matters.
|
||||
# Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c
|
||||
machine.succeed(
|
||||
r"""
|
||||
"""
|
||||
find /boot -iname '*boot*.efi' -print0 | \
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot [0-9]\(.*\) ####/#### LoaderInfo: systemd-boot 0\1 ####/' '{}'
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot ${oldVersion} ####/' '{}'
|
||||
"""
|
||||
)
|
||||
return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta.license = lib.licenses.unfree;
|
||||
};
|
||||
in
|
||||
lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
lib.optionalString finalAttrs.doCheck ''
|
||||
MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
|
||||
file test.o | grep "ELF 32-bit"
|
||||
'';
|
||||
|
||||
@@ -1319,11 +1319,11 @@
|
||||
"vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-mIiTAFVWNoD2JkVJNYUbrhOPNwCY/ocbTnoGbFROggo=",
|
||||
"hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.83.13",
|
||||
"rev": "v1.83.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1508,12 +1508,12 @@
|
||||
"vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY="
|
||||
},
|
||||
"yandex-cloud_yandex": {
|
||||
"hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=",
|
||||
"hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.218.0",
|
||||
"rev": "v0.215.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA="
|
||||
"vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# see also: https://profanity-im.github.io/guide/latest/build.html#expl
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
|
||||
(lib.mesonBool "tests" finalAttrs.doCheck)
|
||||
(lib.mesonEnable "notifications" notifySupport)
|
||||
(lib.mesonEnable "python-plugins" pythonPluginSupport)
|
||||
(lib.mesonEnable "c-plugins" true)
|
||||
|
||||
@@ -420,18 +420,18 @@ in
|
||||
|
||||
docker_29 =
|
||||
let
|
||||
version = "29.6.2";
|
||||
version = "29.6.1";
|
||||
in
|
||||
callPackage dockerGen {
|
||||
inherit version;
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-WpPSePMCfWAVxCkX1nZyI+sra/Vug009ZPmnVKDaX0I=";
|
||||
cliHash = "sha256-cpK2UMRP/WXHsehG9Sq5UJAjhMesmXTrhe00y4RMRZc=";
|
||||
mobyRev = "docker-v${version}";
|
||||
mobyHash = "sha256-zrvrZCRUuiZ2vixZNOUFeGmDehHzSI+FzDMzV1gMqMc=";
|
||||
mobyHash = "sha256-gv+mea9X5TYDWN3IBRpmw0+R2waGxCiubdatNTeUQZI=";
|
||||
runcRev = "v1.3.6";
|
||||
runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc=";
|
||||
containerdRev = "v2.2.6";
|
||||
containerdHash = "sha256-Ngo9x847cXFYPnj/0I+g7BeV7e1/5T2YXfA1zkIdiPg=";
|
||||
containerdRev = "v2.2.5";
|
||||
containerdHash = "sha256-3ui+0AjEU6H4VHYwF3G85ggVMUdONCLJ5KfciFasmkk=";
|
||||
tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
|
||||
tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
|
||||
};
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
pkgs,
|
||||
versionCheckHook,
|
||||
testers,
|
||||
afew,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
@@ -38,7 +39,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pkgs.notmuch
|
||||
versionCheckHook
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
freezegun
|
||||
@@ -55,6 +55,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
"man"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = afew;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/afewmail/afew";
|
||||
description = "Initial tagging script for notmuch mail";
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}"
|
||||
"MANDIR=share/man"
|
||||
]
|
||||
++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}";
|
||||
++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}";
|
||||
|
||||
installFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
|
||||
@@ -193,7 +193,7 @@ let
|
||||
# https://discourse.ardour.org/t/ardour-8-2-released/109615/8
|
||||
# "--use-external-libs"
|
||||
]
|
||||
++ lib.optional finalAttrs.finalPackage.doCheck "--test"
|
||||
++ lib.optional finalAttrs.doCheck "--test"
|
||||
++ lib.optional optimize "--optimize";
|
||||
|
||||
env = {
|
||||
|
||||
@@ -345,9 +345,9 @@
|
||||
|
||||
vm-repair = mkAzExtension rec {
|
||||
pname = "vm-repair";
|
||||
version = "2.2.1";
|
||||
version = "2.2.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-k/6ATtYT2YXaHm5nbb0Tf7xE98Oz9svRlbjodCOOuo8=";
|
||||
hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ=";
|
||||
description = "Support for repairing Azure Virtual Machines";
|
||||
propagatedBuildInputs = with python3Packages; [ opencensus ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
@@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_USDT" enableTracing)
|
||||
(lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN")
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
|
||||
++ lib.optionals (!finalAttrs.doCheck) [
|
||||
(lib.cmakeBool "BUILD_TESTS" false)
|
||||
(lib.cmakeBool "BUILD_FUZZ_BINARY" false)
|
||||
(lib.cmakeBool "BUILD_GUI_TESTS" false)
|
||||
|
||||
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_ZMQ" true)
|
||||
(lib.cmakeBool "WITH_USDT" enableTracing)
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
|
||||
++ lib.optionals (!finalAttrs.doCheck) [
|
||||
(lib.cmakeBool "BUILD_TESTS" false)
|
||||
(lib.cmakeBool "BUILD_FUZZ_BINARY" false)
|
||||
(lib.cmakeBool "BUILD_GUI_TESTS" false)
|
||||
|
||||
@@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BRLCAD_ENABLE_STRICT" false)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt)
|
||||
(lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics")
|
||||
(lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}")
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
lib.concatStringsSep "\n\n" extraCertificateStrings
|
||||
);
|
||||
|
||||
version = "3.126";
|
||||
version = "3.125";
|
||||
meta = {
|
||||
homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers";
|
||||
description = "Bundle of X.509 certificates of public Certificate Authorities (CA)";
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
||||
"https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}"
|
||||
"https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}"
|
||||
];
|
||||
hash = "sha256-gbfyV2MzouNg5nP5Etewt6dl2DbHMQA+NIpGysXTcZg=";
|
||||
hash = "sha256-5XkSgI2u97Kw+k3yzPF+R66vJsg5o4+Fx2AD66/YZr0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
rustPlatform,
|
||||
cacert,
|
||||
writableTmpDirAsHomeHook,
|
||||
flac,
|
||||
lame,
|
||||
makeBinaryWrapper,
|
||||
@@ -19,37 +16,24 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "caesura";
|
||||
version = "0.31.0";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RogueOneEcho";
|
||||
repo = "caesura";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+REt+MKImO7fnYWJ32P6mKzulGJTnxc+9ednVF5aCJU=";
|
||||
hash = "sha256-ifaZ+rmMmWhn8HM25sRPXJKuXvWE5VG+5hFMi9hqxA0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "normalize-sox-dependent-full-spectrogram-widths.patch";
|
||||
url = "https://github.com/RogueOneEcho/caesura/commit/3af818ae35a3e18f444c889d9d3b88294f4f110f.patch?full_index=1";
|
||||
hash = "sha256-znAbk6hFVj198BUUwwDo76SWei0cKINeXzlYEFvTwHA=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-0+vZma8AC44XqVHzmJT/roV7sy8w6DYhujRK9N91J5c=";
|
||||
cargoHash = "sha256-g8Duhl5nZ6umIrAafW7s4vtDS+f06CWnFLoLSw0wa4o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
nativeCheckInputs = [
|
||||
cacert
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ runtimeDeps;
|
||||
nativeCheckInputs = runtimeDeps;
|
||||
|
||||
env = {
|
||||
CAESURA_NIX = "1";
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-edit";
|
||||
version = "0.13.13";
|
||||
version = "0.13.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = "cargo-edit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yaY6krZ+kt2g3Wnnzsw4P3xnpsaZuNwFfRk9GLvwps8=";
|
||||
hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q4GDA81w0JR9rcpKSPe9Y+9HPpFdAvYP2RI+91R4NWE=";
|
||||
cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/share/java $out/bin
|
||||
cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar
|
||||
makeWrapper ${jre}/bin/java $out/bin/closure-compiler \
|
||||
--add-flags "\$NIX_JAVA_ARGS -jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar"
|
||||
--add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags =
|
||||
lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON"
|
||||
lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON"
|
||||
++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
librusty_v8 ? callPackage ./librusty_v8.nix {
|
||||
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
|
||||
},
|
||||
livekit-libwebrtc,
|
||||
lld,
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
@@ -25,18 +26,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.145.0";
|
||||
version = "0.144.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-/r4mBoJhHB1v5NTA4Hk565/D5B0deYJf9xJW330hyf0=";
|
||||
hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-t9IMRK9R+Z67ThEcgBI0HQU0E4aJHcOjKp22RFclh9U=";
|
||||
cargoHash = "sha256-S4dsZXfmKvJItL2XYKyxfhqdCMATEG6oPjrtVRwkuYc=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -56,6 +57,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# webrtc-sys asks rustc to link libwebrtc statically by default,
|
||||
# but nixpkgs provides libwebrtc as a shared library.
|
||||
# use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking
|
||||
# to use the shared library instead
|
||||
substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \
|
||||
--replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail 'lto = "thin"' "" \
|
||||
--replace-fail 'codegen-units = 4' ""
|
||||
@@ -84,6 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# character-conversion warning-as-error disabled.
|
||||
env = {
|
||||
LIBCLANG_PATH = "${lib.getLib libclang}/lib";
|
||||
LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc;
|
||||
NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-error=stringop-overflow"
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dash";
|
||||
version = "0.5.13.5";
|
||||
version = "0.5.13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-QAkBAaKkkfE+kB09SOkEFPJmNGKLm//zX/VANjwien0=";
|
||||
hash = "sha256-0Q39Qc2lkWVWDbOcqRXCxKdjb/8EKB2NLfd62Sx1Pis=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doctest";
|
||||
version = "2.5.3";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doctest";
|
||||
repo = "doctest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+/IEISqN9HdaCJ0udLVUitOUziLvF/D3POecZMoXuho=";
|
||||
hash = "sha256-4jW6xPFCFxk1l47EkSUVojhycrtluPhOc5Adf/25R7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "egctl";
|
||||
version = "1.8.3";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envoyproxy";
|
||||
repo = "gateway";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dhAzFpo+pnttcVBVTbOK7sOEeXaIkdPF058Zt8M2JHU=";
|
||||
hash = "sha256-givYesuucfw/gumEwxpU/NTtyfZQgmGXg7u+xg9Yx0s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rAShQLNGffK/l8H6b004HfC/Jt3I4ReVlb2YV9yMrwQ=";
|
||||
vendorHash = "sha256-5Hlycq0+/wvboP81MKlKBFLEgxa545eyXwPtueHONNE=";
|
||||
# Fix case-insensitive conflicts producing platform-dependent checksums
|
||||
# https://github.com/microsoft/go-mssqldb/issues/234
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
|
||||
++ lib.optionals (!finalAttrs.doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
]
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
esptool,
|
||||
git,
|
||||
versionCheckHook,
|
||||
addBinToPathHook,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
@@ -25,14 +24,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "esphome";
|
||||
version = "2026.6.5";
|
||||
version = "2026.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8=";
|
||||
hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -86,6 +85,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
jinja2
|
||||
paho-mqtt
|
||||
pillow
|
||||
platformio
|
||||
puremagic
|
||||
py7zr
|
||||
pyparsing
|
||||
@@ -138,7 +138,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
++ [
|
||||
git
|
||||
versionCheckHook
|
||||
addBinToPathHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@@ -150,6 +149,10 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
"tests/unit_tests/test_espidf_component.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
let
|
||||
argcomplete = lib.getExe' python.pkgs.argcomplete "register-python-argcomplete";
|
||||
@@ -161,6 +164,8 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
--fish <(${argcomplete} --shell fish esphome)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
disabledTests = [
|
||||
# tries to import platformio, which is wrapped in an fhsenv
|
||||
"test_clean_build"
|
||||
@@ -202,7 +207,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
picnoir
|
||||
thanegill
|
||||
karlbeecken
|
||||
tmarkus
|
||||
];
|
||||
mainProgram = "esphome";
|
||||
};
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ethtool";
|
||||
version = "7.1";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-TXjCbtwCVbyS9LmVtf1mEI11/5Zu1GlPYCWm03C8JJY=";
|
||||
hash = "sha256-Zgv5clp4cTQ6DSMgaKdjT7z7abbC+O/0VYJ/rvsM0WI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"))
|
||||
(lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled"))
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE")
|
||||
else
|
||||
echo "Keeping checkPhase as-is"
|
||||
cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}")
|
||||
cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}")
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# and cannot bind FHS paths since those are not available on NixOS.
|
||||
finalAttrs.passthru.icon-validator-patch
|
||||
]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
++ lib.optionals finalAttrs.doCheck [
|
||||
# Hardcode paths used by tests and change test runtime generation to use files from Nix store.
|
||||
# https://github.com/flatpak/flatpak/issues/1460
|
||||
(replaceVars ./fix-test-paths.patch {
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fluidsynth";
|
||||
version = "2.5.6";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q4NdfemCprYEYCrKlHumeRM8TyNz8eJcFM18EsB0p0c=";
|
||||
hash = "sha256-WEzOYHtPIUkPZu3v4dWcCh3dOJUyG1xRxDuoSXqiGbk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -52,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/FluidSynth/fluidsynth/blob/${finalAttrs.src.tag}/doc/wiki/ChangeLog.md";
|
||||
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
|
||||
homepage = "https://www.fluidsynth.org";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false)
|
||||
(lib.cmakeBool "FTXUI_BUILD_DOCS" true)
|
||||
(lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
unzip
|
||||
zip
|
||||
]
|
||||
++ lib.optionals finalAttrs.finalPackage.doCheck [
|
||||
++ lib.optionals finalAttrs.doCheck [
|
||||
mtools
|
||||
dosfstools
|
||||
];
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
bison,
|
||||
cmake,
|
||||
flex,
|
||||
perl,
|
||||
gmp,
|
||||
@@ -12,22 +12,30 @@
|
||||
enableGist ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gecode";
|
||||
version = "6.4.0";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gecode";
|
||||
repo = "gecode";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8=";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Gecode/gecode/pull/74
|
||||
(fetchpatch {
|
||||
name = "fix-const-weights-clang.patch";
|
||||
url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
|
||||
sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontWrapQtApps = true;
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
flex
|
||||
];
|
||||
buildInputs = [
|
||||
@@ -44,4 +52,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 2591e6a..dc1bd8d 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -69,7 +69,7 @@ if get_option('enable-backend')
|
||||
if systemd.found()
|
||||
sysusers_dir = systemd.get_variable(pkgconfig: 'sysusersdir')
|
||||
else
|
||||
- sysusers_dir = '/usr/lib/sysusers.d'
|
||||
+ sysusers_dir = join_paths(get_option('prefix'), 'usr/lib/sysusers.d')
|
||||
endif
|
||||
configure_file(output: 'geoclue-sysusers.conf',
|
||||
input: 'geoclue-sysusers.conf.in',
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geoclue";
|
||||
version = "2.8.1";
|
||||
version = "2.7.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -42,12 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CyZhUMAa2vMUi61sL+gGBZFxGo0lu7Cm68fTjcbblTg=";
|
||||
hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
./fix-sysusers_dir.patch
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -4,22 +4,21 @@
|
||||
buildGoModule,
|
||||
testers,
|
||||
gitea-actions-runner,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitea-actions-runner";
|
||||
version = "2.1.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.com";
|
||||
owner = "gitea";
|
||||
repo = "runner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jkK61OZgbMDHD5yxrpyP1BWCVzDiR79dVaC5ItS99BU=";
|
||||
hash = "sha256-p6NdkQiZiEeuQjJp3CKTayStZlyk3d1XGigSI5uuLp0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5K0vL0CDYgL/Ud7i4um3mz887Er4qmuhCd9dt5zyUHA=";
|
||||
vendorHash = "sha256-T1T5ZpGqGmipIkTWlYxlsLdAthW8bhcAvr0xyZ74+wQ=";
|
||||
|
||||
# Tests require network access (artifactcache tests try to determine outbound IP)
|
||||
doCheck = false;
|
||||
@@ -34,12 +33,9 @@ buildGoModule (finalAttrs: {
|
||||
mv "$out/bin/runner" "$out/bin/gitea-runner"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = gitea-actions-runner;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gitea-actions-runner;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "19.1.1";
|
||||
version = "19.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QKiHd4UFTuAZElQ/793Tyid983RnfU9TeNpe1gFwChA=";
|
||||
hash = "sha256-uScTzj4pSRtSFCMxoOR5KqipCbPknwnydPYG6xU5dOo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ed2PrEkkqZEWhFLtT1BJavWiacLuv4U7kIAcscMDQgM=";
|
||||
vendorHash = "sha256-QqqTkIgR9ca1dYQ32SG7C+SpEIA07Hlf8x3lVhZ5vRQ=";
|
||||
|
||||
# For patchShebangs
|
||||
buildInputs = [ bash ];
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitte";
|
||||
version = "0.9.1";
|
||||
version = "0.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ckruse";
|
||||
repo = "Gitte";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/vVNWYuTsFf9SsL/PvM5hOJfULeibRn+9ukAbTs5rXk=";
|
||||
hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-oz8pX33jua+bOBEmI87p4rkUxYrhzagBLcQvSHPOkp0=";
|
||||
hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
version ?
|
||||
# This is a workaround for update-source-version to be able to update this
|
||||
let
|
||||
_version = "0-unstable-2026-05-27";
|
||||
_version = "0-unstable-2026-04-01";
|
||||
in
|
||||
_version,
|
||||
rev ? "3357c4f51b1a9e676378c695dd9c7e9911c35ee6",
|
||||
hash ? "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=",
|
||||
rev ? "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
|
||||
hash ? "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -1,61 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
gettext,
|
||||
fetchurl,
|
||||
libtool,
|
||||
pkg-config,
|
||||
libgphoto2,
|
||||
fuse3,
|
||||
fuse,
|
||||
glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gphoto2fs";
|
||||
version = "1.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gphoto";
|
||||
repo = "gphotofs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3DdL4FQzLEzvREhoZYfZlzZvyow/EATN/Q0HtOmdWKA=";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2";
|
||||
hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
gettext
|
||||
libtool
|
||||
glib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libgphoto2
|
||||
fuse3
|
||||
fuse
|
||||
glib
|
||||
libtool
|
||||
];
|
||||
|
||||
# gphotofs_init() still declares the FUSE 2 callback signature, which GCC 14 rejects
|
||||
env = lib.optionalAttrs stdenv.cc.isGNU {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/gphotofs --help > /dev/null
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Fuse FS to mount a digital camera";
|
||||
mainProgram = "gphotofs";
|
||||
homepage = "http://www.gphoto.org/";
|
||||
changelog = "https://github.com/gphoto/gphotofs/releases/tag/${finalAttrs.src.tag}";
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Only;
|
||||
license = with lib.licenses; [
|
||||
lgpl2
|
||||
gpl2
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "graphviz";
|
||||
version = "15.1.0";
|
||||
version = "14.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5v/ib8hwqHrJLs+jvDGvg0aJiKIt8ipXEd1EUzew7XU=";
|
||||
hash = "sha256-LkyiKl0ulS9ujEdVLfyeoc4CtjITd6CAc35IUtlHSfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
# Building tests is broken on Darwin.
|
||||
|
||||
@@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doBuildExamples = false;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples)
|
||||
];
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fix build on i686 by not trying to build AVX2 code
|
||||
# Submitted upstream: https://github.com/HdrHistogram/HdrHistogram_c/pull/143
|
||||
patches = [
|
||||
${if stdenv.hostPlatform.isi686 then "patches" else null} = [
|
||||
./no-avx2-i386.patch
|
||||
];
|
||||
|
||||
|
||||
142
pkgs/by-name/hy/hyprpanel/package.nix
Normal file
142
pkgs/by-name/hy/hyprpanel/package.nix
Normal file
@@ -0,0 +1,142 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
ags,
|
||||
astal,
|
||||
awww,
|
||||
bluez,
|
||||
bluez-tools,
|
||||
brightnessctl,
|
||||
btop,
|
||||
dart-sass,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
glib-networking,
|
||||
gnome-bluetooth,
|
||||
gpu-screen-recorder,
|
||||
gpustat,
|
||||
grimblast,
|
||||
gtksourceview3,
|
||||
gvfs,
|
||||
hyprpicker,
|
||||
libgtop,
|
||||
libnotify,
|
||||
libsoup_3,
|
||||
matugen,
|
||||
networkmanager,
|
||||
nix-update-script,
|
||||
python3,
|
||||
pywal16,
|
||||
stdenv,
|
||||
upower,
|
||||
wireplumber,
|
||||
wl-clipboard,
|
||||
writeShellScript,
|
||||
writeShellScriptBin,
|
||||
|
||||
enableCuda ? config.cudaSupport,
|
||||
}:
|
||||
|
||||
let
|
||||
# TODO: Remove once hyprpanel updates to use `awww`
|
||||
swww-compat = writeShellScriptBin "swww" ''
|
||||
exec awww "$@"
|
||||
'';
|
||||
swww-daemon-compat = writeShellScriptBin "swww-daemon" ''
|
||||
exec awww-daemon "$@"
|
||||
'';
|
||||
in
|
||||
|
||||
ags.bundle {
|
||||
pname = "hyprpanel";
|
||||
version = "0-unstable-2026-04-23";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jas-SinghFSU";
|
||||
repo = "HyprPanel";
|
||||
rev = "1961ba86ad5ab880beb639e5454054b2b5037e0d";
|
||||
hash = "sha256-QowlCOrE4jGOTDCUCEx/E8gHjqSx3r25y7v4dEBpBhk=";
|
||||
};
|
||||
|
||||
# keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
|
||||
dependencies = [
|
||||
astal.apps
|
||||
astal.battery
|
||||
astal.bluetooth
|
||||
astal.cava
|
||||
astal.hyprland
|
||||
astal.mpris
|
||||
astal.network
|
||||
astal.notifd
|
||||
astal.powerprofiles
|
||||
astal.tray
|
||||
astal.wireplumber
|
||||
|
||||
awww
|
||||
bluez
|
||||
bluez-tools
|
||||
brightnessctl
|
||||
btop
|
||||
dart-sass
|
||||
glib
|
||||
gnome-bluetooth
|
||||
grimblast
|
||||
gtksourceview3
|
||||
gvfs
|
||||
hyprpicker
|
||||
libgtop
|
||||
libnotify
|
||||
libsoup_3
|
||||
matugen
|
||||
networkmanager
|
||||
pywal16
|
||||
swww-compat
|
||||
swww-daemon-compat
|
||||
upower
|
||||
wireplumber
|
||||
wl-clipboard
|
||||
(python3.withPackages (
|
||||
ps:
|
||||
with ps;
|
||||
[
|
||||
dbus-python
|
||||
pygobject3
|
||||
]
|
||||
++ lib.optional enableCuda gpustat
|
||||
))
|
||||
]
|
||||
++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]);
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
postFixup =
|
||||
let
|
||||
script = writeShellScript "hyprpanel" ''
|
||||
export GIO_EXTRA_MODULES='${glib-networking}/lib/gio/modules'
|
||||
if [ "$#" -eq 0 ]; then
|
||||
exec @out@/bin/.hyprpanel
|
||||
else
|
||||
exec ${astal.io}/bin/astal -i hyprpanel "$*"
|
||||
fi
|
||||
'';
|
||||
in
|
||||
# bash
|
||||
''
|
||||
mv "$out/bin/hyprpanel" "$out/bin/.hyprpanel"
|
||||
cp '${script}' "$out/bin/hyprpanel"
|
||||
substituteInPlace "$out/bin/hyprpanel" \
|
||||
--replace-fail '@out@' "$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Bar/Panel for Hyprland with extensive customizability";
|
||||
homepage = "https://github.com/Jas-SinghFSU/HyprPanel";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ PerchunPak ];
|
||||
mainProgram = "hyprpanel";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -4,25 +4,32 @@
|
||||
fetchFromGitHub,
|
||||
libunwind,
|
||||
cmake,
|
||||
pcre2,
|
||||
pcre,
|
||||
gdb,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "6.0.0";
|
||||
version = "5.9.18";
|
||||
pname = "igprof";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "igprof";
|
||||
repo = "igprof";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RIDnilCoYlq0D9CBJKMX1zg1DBQ4RPcOlfGcZ2xosUo=";
|
||||
sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/igprof \
|
||||
--replace-fail libigprof.so $out/lib/libigprof.so
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libunwind
|
||||
gdb
|
||||
pcre2
|
||||
pcre
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -34,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
description = "Ignominous Profiler";
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -67,6 +67,26 @@
|
||||
assert libXtSupport -> libX11Support;
|
||||
assert libraqmSupport -> freetypeSupport;
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
"i686"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin"
|
||||
then
|
||||
"x86-64"
|
||||
else if stdenv.hostPlatform.system == "armv7l-linux" then
|
||||
"armv7l"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin"
|
||||
then
|
||||
"aarch64"
|
||||
else if stdenv.hostPlatform.system == "powerpc64le-linux" then
|
||||
"ppc64le"
|
||||
else
|
||||
null;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-27";
|
||||
@@ -93,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MVDelegate=${lib.getExe' coreutils "mv"}"
|
||||
"RMDelegate=${lib.getExe' coreutils "rm"}"
|
||||
"--with-frozenpaths"
|
||||
"--with-gcc-arch=generic"
|
||||
(lib.withFeatureAs (arch != null) "gcc-arch" arch)
|
||||
(lib.withFeature librsvgSupport "rsvg")
|
||||
(lib.withFeature librsvgSupport "pango")
|
||||
(lib.withFeature liblqr1Support "lqr")
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4=";
|
||||
};
|
||||
|
||||
patches = lib.optional finalAttrs.finalPackage.doCheck (
|
||||
patches = lib.optional finalAttrs.doCheck (
|
||||
# 1. Do not fetch the Unity GitHub repository
|
||||
# 2. Lookup the Unity pkgconfig file
|
||||
# 3. Get the generate_test_runner.rb file from the Unity share directory
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic)
|
||||
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev" # suppress cmake warning about deprecated usage
|
||||
(lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
|
||||
];
|
||||
|
||||
|
||||
@@ -3,17 +3,10 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
makeBinaryWrapper,
|
||||
undmg,
|
||||
versionCheckHook,
|
||||
xz,
|
||||
bzip2,
|
||||
wl-clipboard,
|
||||
# On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for
|
||||
# clipboard access. Enabling this puts wl-clipboard on the runtime PATH so
|
||||
# clipboard support works out of the box under Wayland sessions. Has no
|
||||
# effect on Darwin.
|
||||
waylandSupport ? stdenv.hostPlatform.isLinux,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -48,9 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [
|
||||
makeBinaryWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
undmg
|
||||
];
|
||||
@@ -75,12 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat
|
||||
install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && waylandSupport) ''
|
||||
for bin in kiro-cli kiro-cli-chat kiro-cli-term; do
|
||||
wrapProgram $out/bin/$bin \
|
||||
--suffix PATH : ${lib.makeBinPath [ wl-clipboard ]}
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/bin $out/Applications
|
||||
cp -r "../Kiro CLI.app" "$out/Applications/"
|
||||
|
||||
@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
|
||||
hashable
|
||||
isocline
|
||||
lens
|
||||
lsp_2_8_0_0
|
||||
lsp
|
||||
mtl
|
||||
network
|
||||
network-simple
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "ku";
|
||||
version = "0.9.0";
|
||||
version = "0.8.2";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "ku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4z4lPvmkEqC7YBEaAa8cUyB42hkFkTFRkHGaA58/Vpg=";
|
||||
hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44=";
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libapparmor";
|
||||
version = "5.0.2";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "apparmor";
|
||||
repo = "apparmor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Kuc5Nrz4iq5MC5AOcJL9Sb54DWNKlEk3b3DW0vpgSZg=";
|
||||
hash = "sha256-y5r8X7Cpwp7TSsKYXNoAeyy0MbgxLSW8gNtLsIvKP8c=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libffi";
|
||||
version = "3.7.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-1emmY43b0lE921RRjrZ+S75vpwe8wBwQ9iEvCgiNgZ0=";
|
||||
hash = "sha256-IlXFpjjftRv2fCChKnu3DRf+senqurrAX1VzFG9YZDY=";
|
||||
};
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
@@ -32,6 +32,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./freebsd-tsan-pthread.patch
|
||||
];
|
||||
|
||||
# To workaround https://github.com/libffi/libffi/issues/993, we empty the test file:
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin "echo 'int main (void) { return 0; }' > testsuite/libffi.call/i128-1.c";
|
||||
|
||||
strictDeps = true;
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -91,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "http://sourceware.org/libffi/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aduh95 ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [ "libffi" ];
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
|
||||
"-DENABLE_SASL=ON"
|
||||
];
|
||||
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmwaw";
|
||||
version = "0.3.23";
|
||||
version = "0.3.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${finalAttrs.version}/libmwaw-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-rDWQ9pGikE64x9yLdXuKKfEl9ZJEnkIUWa6PqSizmes=";
|
||||
sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmysofa";
|
||||
version = "1.3.4";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gP/RjKzMx8JIYcyiivBGvy3kIdwHMEKY6abssyVUKNQ=";
|
||||
hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3")
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -100,17 +100,6 @@ let
|
||||
moveToOutput "share/man/man1/nc.1.gz" "$nc"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
# Check whether the build target actually contains our cacert.
|
||||
# A simple binary match for the path is enough.
|
||||
grep "${cacert}/etc/ssl/certs/ca-bundle.crt" $out/lib/*libtls*
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Free TLS/SSL implementation";
|
||||
homepage = "https://www.libressl.org";
|
||||
@@ -150,13 +139,6 @@ let
|
||||
url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
|
||||
hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
|
||||
};
|
||||
|
||||
# https://github.com/libressl/portable/issues/1295
|
||||
# https://github.com/libressl/portable/pull/1303
|
||||
tls-default-ca-patch = fetchpatch {
|
||||
url = "https://github.com/libressl/portable/commit/c85e07d0d68129fc1b1c9039b266099c8d735c3d.patch";
|
||||
hash = "sha256-oNL3v8Ef1HrayXn+/3T4UhHLJos8eVMlqebVyaxnWVo=";
|
||||
};
|
||||
in
|
||||
{
|
||||
# 4.2 was released October 2025 and will become unsupported on October 22,
|
||||
@@ -166,7 +148,6 @@ in
|
||||
hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws=";
|
||||
patches = [
|
||||
common-cmake-install-full-dirs-patch
|
||||
tls-default-ca-patch
|
||||
];
|
||||
};
|
||||
|
||||
@@ -175,8 +156,5 @@ in
|
||||
libressl_4_3 = generic {
|
||||
version = "4.3.2";
|
||||
hash = "sha256-7fAa7iTGXWnmqe/LnUS82mgv+dTzu72V55Th36kIR7U=";
|
||||
patches = [
|
||||
tls-default-ca-patch
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsodium";
|
||||
version = "1.0.22-unstable-2026-07-08";
|
||||
version = "1.0.22-unstable-2026-04-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jedisct1";
|
||||
repo = "libsodium";
|
||||
rev = "77a422c85a3b8b487de50c811b38d18394831ba6";
|
||||
hash = "sha256-Ahka2PnrmYvTLjZMzik5mFsxhDpMLRMKT/I5ftUb0Xc=";
|
||||
rev = "33cc75ab1565d9dcbe808354191bd572ad6b64d0";
|
||||
hash = "sha256-8kS9FBoaFaJOjH7XZc8IG3GaQaUiYD/awQOhs7j0n1Y=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libssh";
|
||||
version = "0.12.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libssh.org/files/${lib.versions.majorMinor finalAttrs.version}/libssh-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-05Qa8KLXjV2C7Xo2mI6RM5lDEvA1uWWabkP42zloeEw=";
|
||||
hash = "sha256-Gmr0JNgyfl7t705f5/W5JCJt1hesnz3oDyF9gqNqcSE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtiff";
|
||||
version = "4.7.2";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libtiff";
|
||||
repo = "libtiff";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-60Lpg5WRfWMzlOoOUA+C6KLlYIZ+3BjXidOVqv4M2GA=";
|
||||
hash = "sha256-UiC6s86i7UavW86EKm74oPVlEacvoKmwW7KETjpnNaI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_SYSTEMD" withSystemd)
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
|
||||
(lib.cmakeBool "WITH_EXAMPLES" buildExamples)
|
||||
(lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
# This test checks if using the **installed** headers works.
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic)
|
||||
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lightningcss";
|
||||
version = "1.33.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parcel-bundler";
|
||||
repo = "lightningcss";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-twodhkzM/h4ijZFeB2tQAOAV131r1ggLr3tcXUUGHFo=";
|
||||
hash = "sha256-JqAzBPYbJq52exCpVTdhd90BQGsbfMOx68PD1xUripg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Jz6kpaan1HNJKhG7Jb5f5mfZoYNDwQhemTuVCf5Cn0Q=";
|
||||
cargoHash = "sha256-zndBkOJ/U6lLaOJn273TabMAPbz96hQeWs4cPKFDGro=";
|
||||
|
||||
patches = [
|
||||
# Backport fix for build error for lightningcss-napi
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "markdown-code-runner";
|
||||
version = "0.5.2";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drupol";
|
||||
repo = "markdown-code-runner";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xToBnuWjjh1Zle6lcWdYWO9iDhSJh1cbOOEr9p0n1vU=";
|
||||
hash = "sha256-GcPMkwXwLyHoVljOpfnhmysDYIFXSyvNL5P3f6q/KJw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tGEXJMlrxIBCzWVgOfcDNHq2Zli0mJVaOMdmwP9GhCk=";
|
||||
cargoHash = "sha256-ul5cl6FDYkW02HGtQmLHkOsSaTIn2lCaTpKjCUzdcjM=";
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
|
||||
(lib.withFeature finalAttrs.doCheck "gtest")
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [
|
||||
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
|
||||
(lib.withFeature finalAttrs.doCheck "gtest")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -20,21 +20,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.21.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg=";
|
||||
hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA=";
|
||||
cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-9a62WlBQW8lgXluMh+DM21CkFCqFYd7yUz220G1uTIY=";
|
||||
hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I=";
|
||||
};
|
||||
|
||||
pnpmRoot = "frontend";
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version))
|
||||
(lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version))
|
||||
(lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version))
|
||||
(lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck)
|
||||
]
|
||||
++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON";
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "4.2.0";
|
||||
hash = "sha256-Xz5W5zYPNlASPyc1/Sz2O1LONdxpUkg1hgzKdax/3ag=";
|
||||
version = "4.1.0";
|
||||
hash = "sha256-TA1uka13So8URttw+JJVdKIL+IonkhIQSc0IfraXpIM=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.6.7";
|
||||
hash = "sha256-t1ZPeFA3ftKaEIaXQ7RXZEsiOAYK4KSSm55SFr9g17A=";
|
||||
version = "3.6.6";
|
||||
hash = "sha256-+PW41/c8M/Yz0EVWM4Gt4HTNBMUTU5MayaKVZ+upLIo=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [
|
||||
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
|
||||
(lib.withFeature finalAttrs.doCheck "gtest")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
MI_SECURE = secureBuild;
|
||||
MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries;
|
||||
MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl";
|
||||
MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck;
|
||||
MI_BUILD_TESTS = finalAttrs.doCheck;
|
||||
|
||||
# MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a).
|
||||
# Nixpkgs's native platform configuration does a better job.
|
||||
|
||||
@@ -13,6 +13,22 @@
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
gecode_6_3_0 = gecode.overrideAttrs (_: {
|
||||
version = "6.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gecode";
|
||||
repo = "gecode";
|
||||
rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a";
|
||||
hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k=";
|
||||
};
|
||||
patches = [ ];
|
||||
});
|
||||
in
|
||||
let
|
||||
gecode = gecode_6_3_0;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minizinc";
|
||||
version = "2.9.7";
|
||||
|
||||
@@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "MZ_OPENSSL" true)
|
||||
(lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone
|
||||
(lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers
|
||||
(lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "MZ_COMPAT" enableCompat)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isi686 [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromCodeberg,
|
||||
aeson,
|
||||
base,
|
||||
bytestring,
|
||||
@@ -26,7 +26,7 @@
|
||||
mkDerivation rec {
|
||||
pname = "mkjson";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromCodeberg {
|
||||
owner = "mfussenegger";
|
||||
repo = "mkjson";
|
||||
rev = "${version}";
|
||||
|
||||
@@ -1,2 +1,19 @@
|
||||
{ haskell, haskellPackages }:
|
||||
haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { })
|
||||
{
|
||||
haskell,
|
||||
haskellPackages,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) justStaticExecutables overrideCabal;
|
||||
|
||||
# The mkjson-doctest suite depends on specific RNG results not provided by the
|
||||
# GHC in Nixpkgs as of this writing.
|
||||
overrides = {
|
||||
testTargets = [ "mkjson-test" ];
|
||||
};
|
||||
raw-pkg = haskellPackages.callPackage ./generated.nix { };
|
||||
in
|
||||
lib.pipe raw-pkg [
|
||||
(overrideCabal overrides)
|
||||
justStaticExecutables
|
||||
]
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_BUNDLED_DEPS" false)
|
||||
(lib.cmakeBool "WITH_WEBSOCKETS" true)
|
||||
(lib.cmakeBool "WITH_SYSTEMD" withSystemd)
|
||||
(lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.strings.mesonEnable "guile" false)
|
||||
(lib.strings.mesonEnable "scm" false)
|
||||
(lib.strings.mesonEnable "readline" false)
|
||||
(lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
|
||||
(lib.strings.mesonEnable "tests" finalAttrs.doCheck)
|
||||
(lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp")
|
||||
];
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals buildDocs [
|
||||
scdoc
|
||||
]
|
||||
++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [
|
||||
++ lib.optionals (buildDocs || finalAttrs.doCheck) [
|
||||
(python3.withPackages (ps: [ ps.pyyaml ]))
|
||||
];
|
||||
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
find subprojects -name "*.py" -exec chmod +x {} \;
|
||||
patchShebangs subprojects
|
||||
''
|
||||
+ lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
+ lib.optionalString finalAttrs.doCheck ''
|
||||
substituteInPlace \
|
||||
"subprojects/meson-tests/common/14 configure file/test.py.in" \
|
||||
"subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \
|
||||
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(muonBool "static" stdenv.targetPlatform.isStatic)
|
||||
(muonEnable "man-pages" buildDocs)
|
||||
(muonEnable "meson-docs" buildDocs)
|
||||
(muonEnable "meson-tests" finalAttrs.finalPackage.doCheck)
|
||||
(muonEnable "meson-tests" finalAttrs.doCheck)
|
||||
(muonEnable "samurai" embedSamurai)
|
||||
(muonEnable "tracy" false)
|
||||
(muonEnable "website" false)
|
||||
@@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "muon-build";
|
||||
rev = "db92588773a24f67cda2f331b945825ca3a63fa7";
|
||||
hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM=";
|
||||
passthru.use = finalAttrs.finalPackage.doCheck;
|
||||
passthru.use = finalAttrs.doCheck;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nelm";
|
||||
version = "1.25.3";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "nelm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b0gO1V7yv8RMjIxwnqFX9CPRcRFm/j8u2PwNzyA7jtc=";
|
||||
hash = "sha256-2YIxnuHbY9zCVZer+b7JD0fbmUC/ZYyaWmHts7s5ldw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4=";
|
||||
|
||||
@@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: {
|
||||
substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
|
||||
--replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
|
||||
|
||||
${lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
${lib.optionalString finalAttrs.doCheck ''
|
||||
# For some reason these tests fail (intermittently?) with a zero timestamp
|
||||
touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
|
||||
''}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nil";
|
||||
version = "2026-07-23";
|
||||
version = "2025-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxalica";
|
||||
repo = "nil";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-upJVI2pq9sOKgF2AILt8l6O4/3GNcMtT/s0rmnbO5UA=";
|
||||
hash = "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZyTrxGX0mRdskxp4o5ssDCyZzNn36rIgP9fDaA1fDws=";
|
||||
cargoHash = "sha256-OZIajxv8xNfCGalVw/FUAwWdQzPqfGuDoeRg2E2RR7s=";
|
||||
|
||||
nativeBuildInputs = [ nix ];
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "NLOPT_MATLAB" false)
|
||||
(lib.cmakeBool "NLOPT_GUILE" false)
|
||||
(lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
|
||||
(lib.cmakeBool "NLOPT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
|
||||
]
|
||||
++ lib.optional withPython (
|
||||
lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"
|
||||
|
||||
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DNS3_GTK3=ON"
|
||||
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||
]
|
||||
++ lib.optional finalAttrs.finalPackage.doCheck "-DNS3_TESTS=ON";
|
||||
++ lib.optional finalAttrs.doCheck "-DNS3_TESTS=ON";
|
||||
|
||||
# strictoverflow prevents clang from discovering pyembed when bindings
|
||||
hardeningDisable = [
|
||||
|
||||
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# NOTE: Darwin requires a static build; otherwise, tests fail in the Python package.
|
||||
BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1";
|
||||
ONNX_BUILD_PYTHON = "1";
|
||||
ONNX_BUILD_TESTS = if finalAttrs.finalPackage.doCheck then "1" else "0";
|
||||
ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0";
|
||||
# ONNX_ML is enabled by default.
|
||||
# See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73
|
||||
ONNX_ML = "1";
|
||||
|
||||
@@ -286,7 +286,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
# fails to find protoc on darwin, so specify it
|
||||
(lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf))
|
||||
(lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
|
||||
(lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
|
||||
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
|
||||
(lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport)
|
||||
|
||||
@@ -214,7 +214,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
gcp-storage-emulator
|
||||
moto
|
||||
oracledb
|
||||
pinecone
|
||||
pinecone-client
|
||||
playwright
|
||||
pymilvus
|
||||
pymongo
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--disable-bench"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
]
|
||||
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
|
||||
++ lib.optionals (!finalAttrs.doCheck) [
|
||||
"--enable-tests=no"
|
||||
];
|
||||
|
||||
|
||||
@@ -6,17 +6,19 @@
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
stubsSrc = fetchFromGitHub {
|
||||
owner = "JetBrains";
|
||||
repo = "phpstorm-stubs";
|
||||
rev = "f6dd2dd35d99fb774251a83555fe07bf2109d57e";
|
||||
hash = "sha256-H9Td/yi9Um0Z9ifxZdh74bvGCMVSC+MA1OHrtbGD8vE=";
|
||||
rev = "517b9ad1adaf2c5453c00ec2fbb02d192a4a9b6c";
|
||||
hash = "sha256-IDWAuy301avfTF/E7Mby2JQQtIr/gnN5flZ3uctUpus=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "phpantom-lsp";
|
||||
version = "0.9.0";
|
||||
version = "0.8.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "AJenbo";
|
||||
repo = "phpantom_lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-euWaFH40VHefZewUcKvsLwwHZP+GwfTN8kfuAkaABB8=";
|
||||
hash = "sha256-00NAiPm3qqxyS1u1GPpJlgnBlUjDx9VmjK6oOwH8kcU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -36,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
> stubs/jetbrains/phpstorm-stubs/.commit
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-2MIJxVRqyCv5HzCwY1s+rCp1A4vFRsyAEEuyIEegZMA=";
|
||||
cargoHash = "sha256-FyMI8Kb3QUD8Jui9k7vayMcQC+KWL8sZi3A05NPbXsg=";
|
||||
|
||||
checkFlags = [
|
||||
"--test"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user