Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
+5
-3
@@ -1582,7 +1582,7 @@ let
|
||||
# mkDefault properties of the previous option.
|
||||
#
|
||||
mkAliasDefinitions = mkAliasAndWrapDefinitions id;
|
||||
mkAliasAndWrapDefinitions = wrap: option: mkAliasIfDef option (wrap (mkMerge option.definitions));
|
||||
mkAliasAndWrapDefinitions = wrap: option: mkIf option.isDefined (wrap (mkMerge option.definitions));
|
||||
|
||||
# Similar to mkAliasAndWrapDefinitions but copies over the priority from the
|
||||
# option as well.
|
||||
@@ -1594,9 +1594,11 @@ let
|
||||
prio = option.highestPrio or defaultOverridePriority;
|
||||
defsWithPrio = map (mkOverride prio) option.definitions;
|
||||
in
|
||||
mkAliasIfDef option (wrap (mkMerge defsWithPrio));
|
||||
mkIf option.isDefined (wrap (mkMerge defsWithPrio));
|
||||
|
||||
mkAliasIfDef = option: mkIf (isOption option && option.isDefined);
|
||||
mkAliasIfDef =
|
||||
lib.warn "Usage of 'mkAliasIfDef' has been deprecated. Use 'mkIf option.isDefined' instead."
|
||||
(option: mkIf option.isDefined);
|
||||
|
||||
/**
|
||||
Compatibility.
|
||||
|
||||
@@ -7704,6 +7704,13 @@
|
||||
githubId = 103082;
|
||||
name = "Ed Brindley";
|
||||
};
|
||||
eleina = {
|
||||
email = "ellie@eleina.dev";
|
||||
github = "eleinah";
|
||||
githubId = 129979592;
|
||||
name = "Eleina Mironia";
|
||||
keys = [ { fingerprint = "0A86 5F49 90B1 569C B849 5070 2EF4 8A29 49D6 5978"; } ];
|
||||
};
|
||||
eleonora = {
|
||||
email = "leonsch@protonmail.com";
|
||||
github = "42LoCo42";
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
mktplcRef = {
|
||||
name = "amazon-q-vscode";
|
||||
publisher = "AmazonWebServices";
|
||||
version = "1.112.0";
|
||||
hash = "sha256-iuyET7vCZCyldfNuognB6fLDurJzg7XsRme6BjDCQzU=";
|
||||
version = "2.0.0";
|
||||
hash = "sha256-XK0xCwvG5HBqTrERRkjpzbZCiAiK54d9vOt0Na3fzRI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2293,8 +2293,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-vibrancy-continued";
|
||||
publisher = "illixion";
|
||||
version = "1.1.65";
|
||||
hash = "sha256-0DUKDBhabh8vOgPw5p6ZFavRLIuy4vPgOfAa6fLtJRA=";
|
||||
version = "1.1.73";
|
||||
hash = "sha256-hQKkqZi8fQoxVzgpg/JE4zPFR+ldi5eBYpgiqbx7OXo=";
|
||||
};
|
||||
meta = {
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
|
||||
|
||||
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-tG2PUESSzOs5jEPD7Wgtee832pOTOLkxxV/FP7Md6k8=";
|
||||
hash = "sha256-XeNdr1nWK4aYTBEgAu3hXotmrDJ31ocg+w4870TuEGA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-CqgMcb03eA+orz0rmKoSi5qtQXAN/MzrmogGQGV2yzw=";
|
||||
hash = "sha256-yC8fBgj8lHR3y7OWUshWYNpn6fgp2SeKLv9WXxhVP0A=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-kDv8t9COz8sWRH9FlrhrDC9UqGBXD7F0IMaWCbZYwBk=";
|
||||
hash = "sha256-O/SoqC0pNnbNdXylAj0rlKyr7qaJNivw6xhecKFk7JU=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-S27qkOYs3arqa68raX+0itOywnlQZAIjxD93GCEjKhs=";
|
||||
hash = "sha256-pwdTllSB4IXDoyFuo2XxZjkS8lnIjp7AwgggBkjv3Y0=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
publisher = "kilocode";
|
||||
name = "Kilo-Code";
|
||||
version = "7.0.51";
|
||||
version = "7.1.22";
|
||||
}
|
||||
// sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-psx" + lib.optionalString withHw "-hw";
|
||||
version = "0-unstable-2026-03-28";
|
||||
version = "0-unstable-2026-04-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-psx-libretro";
|
||||
rev = "8fcb04d617b55c00f3255287c530242acf3855dc";
|
||||
hash = "sha256-ihS0F/mbHkhrrEiI3bERQxwIgupBiZo2irpzSSWtexE=";
|
||||
rev = "f339f6363de238adcf7c259bff8b0771c9a46399";
|
||||
hash = "sha256-+JV/QQWiAK980ybM63jk6ljsJJWtdVszAFaIWGmzV/4=";
|
||||
};
|
||||
|
||||
extraBuildInputs = lib.optionals withHw [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "bluemsx";
|
||||
version = "0-unstable-2025-11-04";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "bluemsx-libretro";
|
||||
rev = "036376d6679c9e153712dbbb3fdca774afc49706";
|
||||
hash = "sha256-0oT+m30bay/3BQgKBxX397a8o+QP1/IHIo0jGmSWGGg=";
|
||||
rev = "8af516705652d240ef5bc69dea8276d0fdd16323";
|
||||
hash = "sha256-QkJicDAfr+hFAlsqSLlonmGJEf/G9XFQ7oe/X4mvAhw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "freeintv";
|
||||
version = "0-unstable-2026-02-24";
|
||||
version = "0-unstable-2026-03-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "freeintv";
|
||||
rev = "0e0e58503386304c5e7ac860c135583bc52e2e49";
|
||||
hash = "sha256-uRkLF3LSiAMV/k8R8PuE0QZUnc1YEYe0rmccQz6H43A=";
|
||||
rev = "9b66d2b3c3406659b2fdfaade7a80f3e62772815";
|
||||
hash = "sha256-rJatbYyrS9vkGT8+jty80rPkcGGCV9enW5L40NeFwlE=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -887,13 +887,13 @@
|
||||
"vendorHash": "sha256-0Z2V8CyIZEHZFFqTNFnseBbvVenOnpNz9Tlbu7zaPOI="
|
||||
},
|
||||
"maxlaverse_bitwarden": {
|
||||
"hash": "sha256-n1d2n6CX8iV/bRqQSaivRxMAYKA/ctfWPQaFgS7ETgE=",
|
||||
"hash": "sha256-aYgMC2RuRakxztyhP/4MAzQPy/4riKXYZN/XXdT2jQQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
|
||||
"owner": "maxlaverse",
|
||||
"repo": "terraform-provider-bitwarden",
|
||||
"rev": "v0.17.3",
|
||||
"rev": "v0.17.6",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2IlD9IdiN+TBk/Eng2K4jZD8GB91IvQPeVAKhxI/6aY="
|
||||
"vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58="
|
||||
},
|
||||
"metio_migadu": {
|
||||
"hash": "sha256-z3xHms9rHbPa6pTspOwXNOrNG4i03yQCfLOR/Q0g0+Y=",
|
||||
|
||||
@@ -49,7 +49,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "alacritty${lib.optionalString withGraphics "-graphics"}";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src =
|
||||
# by default we want the official package
|
||||
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IOPhnJ76kZ2djJjxJEUwWPvHDeeXbJAn1ClipTH7nWs=";
|
||||
hash = "sha256-iZtCH2DrSs6o3AG2koI2TyC3116aMlawHFkCd0TYhas=";
|
||||
}
|
||||
# optionally we want to build the sixels feature fork
|
||||
else
|
||||
@@ -66,14 +66,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "ayosec";
|
||||
repo = "alacritty";
|
||||
tag = "v${finalAttrs.version}-graphics";
|
||||
hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI=";
|
||||
hash = "sha256-DdiioNKMVg9u4E4h7AysvaGJ6ys36ykTyJgjHWjIjjY=";
|
||||
};
|
||||
|
||||
cargoHash =
|
||||
if !withGraphics then
|
||||
"sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
|
||||
"sha256-BX4PjZXr19SScEZhb0gWkMiJUYq8ByEuVh9RpJSRCHI="
|
||||
else
|
||||
"sha256-VR+URXqsB9zCOSow/f/aWXUlrp6j2XeK0zKESQGzMek=";
|
||||
"sha256-xWW0X4dCgnNMT4T6BNsYmxOOFIK8MIHwUMKVtIHAFYc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1774699422-ga16517"
|
||||
"@sourcegraph/amp": "^0.0.1775463997-ga80857"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring": {
|
||||
@@ -228,9 +228,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1774699422-ga16517",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1774699422-ga16517.tgz",
|
||||
"integrity": "sha512-Y5Y3H2iDgCkuqISWFqlpyT9lTPyXQzhjBOT9TwzvR9z0mHMmq+EDQnyXXfp2u9GTV4yaBsFGHZFzqJXWH5VdMw==",
|
||||
"version": "0.0.1775463997-ga80857",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1775463997-ga80857.tgz",
|
||||
"integrity": "sha512-tQuoo8sh6z6JHyySL9/z/WJbWIZ2PdOxvhB4XMbAVbxs2W32arrDRLY/5iAHbtqsNqz7SXRVrHoQ/yMGre/Trw==",
|
||||
"license": "Amp Commercial License",
|
||||
"dependencies": {
|
||||
"@napi-rs/keyring": "1.1.10"
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1774699422-ga16517";
|
||||
version = "0.0.1775463997-ga80857";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-nM1U5RyQ+wa5RHR4GxPGeoP/93U1G47NIAm2BXRk0y8=";
|
||||
hash = "sha256-H74L/t0gGjn6m3UeZo8Ln1CEgRYZcKXO+I7O8VO7bL4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-USrhTsSRh/j2kR7i20ttr3QN/qv+45w9trJAgYd4axQ=";
|
||||
npmDepsHash = "sha256-tC28yduzwyJrzJbttMW0XLNxiv5dfS5dMiVyfY8J85Q=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
lib,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asccli";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rudrankriyam";
|
||||
repo = "App-Store-Connect-CLI";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-e2USts+HC3skFvexeKhKSJT0KxHlB5LFr54lqGjhZqM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
"-X main.commit=${finalAttrs.src.rev}"
|
||||
"-X main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/App-Store-Connect-CLI $out/bin/asc
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
nativeCheckInputs = [ git ];
|
||||
preCheck = ''
|
||||
export ASC_BYPASS_KEYCHAIN=1
|
||||
'';
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"TestDefaultRunSkillsCheckCommand_UsesSkillsBinaryCheckCommand"
|
||||
"TestDefaultRunSkillsCheckCommand_FallsBackToNpxOffline"
|
||||
"TestDefaultRunSkillsCheckCommand_OfflineCacheMissIsUnavailable"
|
||||
"TestAuthLogoutCommand"
|
||||
"TestAuthStatusInvalidBypassWarningPrintedOnce"
|
||||
];
|
||||
in
|
||||
[
|
||||
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Scriptable CLI for the App Store Connect API";
|
||||
homepage = "https://asccli.sh";
|
||||
changelog = "https://github.com/rudrankriyam/App-Store-Connect-CLI/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
DimitarNestorov
|
||||
];
|
||||
mainProgram = "asc";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,157 @@
|
||||
{
|
||||
alsa-lib,
|
||||
atk,
|
||||
autoPatchelfHook,
|
||||
bubblewrap,
|
||||
cairo,
|
||||
dpkg,
|
||||
fetchurl,
|
||||
freetype,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gtk3,
|
||||
harfbuzz,
|
||||
lcms,
|
||||
lib,
|
||||
libglvnd,
|
||||
libjack2,
|
||||
libjpeg8,
|
||||
libnghttp2,
|
||||
libudev-zero,
|
||||
libx11,
|
||||
libxcb,
|
||||
libxcb-util,
|
||||
libxcb-wm,
|
||||
libxcursor,
|
||||
libxkbcommon,
|
||||
libxtst,
|
||||
makeBinaryWrapper,
|
||||
pango,
|
||||
pipewire,
|
||||
stdenv,
|
||||
vulkan-loader,
|
||||
wrapGAppsHook3,
|
||||
writeShellScript,
|
||||
xcb-imdkit,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bitwig-studio6";
|
||||
version = "6.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "bitwig-studio-${finalAttrs.version}.deb";
|
||||
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${finalAttrs.version}/installer_linux";
|
||||
hash = "sha256-jrCTgaxfeWhfKwLeKLmqTQWS7RVbVnHqJ0InCipmm8k=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeBinaryWrapper
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
cairo
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
harfbuzz
|
||||
lcms
|
||||
libglvnd
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
libjack2
|
||||
libjpeg8
|
||||
libnghttp2
|
||||
libudev-zero
|
||||
libx11
|
||||
libxcb
|
||||
libxcb-util
|
||||
libxcb-wm
|
||||
libxcursor
|
||||
libxkbcommon
|
||||
libxtst
|
||||
pango
|
||||
pipewire
|
||||
vulkan-loader
|
||||
xcb-imdkit
|
||||
zlib
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir "$out"
|
||||
cp -r usr/share "$out"
|
||||
cp -r opt/bitwig-studio "$out"/libexec
|
||||
|
||||
# Bitwig includes a copy of libxcb-imdkit.
|
||||
# Removing it will force it to use our version.
|
||||
rm "$out"/libexec/lib/bitwig-studio/libxcb-imdkit.so.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
let
|
||||
wrapper = writeShellScript "bitwig-studio" ''
|
||||
set -e
|
||||
|
||||
currentDir="$(cd "$(dirname "$0")" && pwd)"
|
||||
outDir="$(cd "$currentDir/.." && pwd)"
|
||||
|
||||
TMPDIR="$(mktemp --directory)"
|
||||
cp -r "$outDir"/libexec/resources/VampTransforms "$TMPDIR"
|
||||
chmod -R u+w "$TMPDIR/VampTransforms"
|
||||
|
||||
bwrap \
|
||||
--bind / / \
|
||||
--bind "$TMPDIR"/VampTransforms "$outDir"/libexec/resources/VampTransforms \
|
||||
--dev-bind /dev /dev \
|
||||
"$outDir"/libexec/bitwig-studio \
|
||||
|| true
|
||||
|
||||
rm -rf "$TMPDIR"
|
||||
'';
|
||||
in
|
||||
''
|
||||
for e in "$out"/libexec/bin/*gtk*; do
|
||||
if [ -f "$e" ] && [ -x "$e" ]; then
|
||||
wrapProgram "$e" "''${gappsWrapperArgs[@]}"
|
||||
fi
|
||||
done
|
||||
|
||||
install -D ${wrapper} "$out"/bin/bitwig-studio
|
||||
wrapProgram "$out"/bin/bitwig-studio \
|
||||
--prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Digital audio workstation";
|
||||
longDescription = ''
|
||||
Bitwig Studio is a multi-platform music-creation system for
|
||||
production, performance and DJing, with a focus on flexible
|
||||
editing tools and a super-fast workflow.
|
||||
'';
|
||||
homepage = "https://www.bitwig.com/";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [
|
||||
bfortz
|
||||
eleina
|
||||
michalrus
|
||||
mrVanDalo
|
||||
];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
mainProgram = "bitwig-studio";
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bsky-cli";
|
||||
version = "0.0.77";
|
||||
version = "0.0.78";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "bsky";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cO2Ub9DVkDcz9+x+EskJsfgJ3xnTba5rWYsxmXfQ2a0=";
|
||||
hash = "sha256-+LZCVF1slJ7Nypi8MogbqXH5GSfcsKJDGKNm4EfLpFY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WFGViuC+8Ba6NCU//Z+MTcwNPJbYzpXeCbf4M9mBFPM=";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkit";
|
||||
version = "0.28.1";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tGn4TQZq1kcueuadwORRZbLTeJs79E7TFEwawfiFGsY=";
|
||||
hash = "sha256-gLWxkvr6Ead75MjMAQJIEMWN97NQfWA2v71rZnAYbo8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cosign";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "cosign";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YYssI+fPw6drMZqAwRk3ubh0l/RgEN8b0eoEunihjlw=";
|
||||
hash = "sha256-Flvi+dVb9RcaS5f1X8A8kevfzNbiSyglEYfJfievVfM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-xC+Wfj1OTLhQAuJlyOB6KPaUXuzOxC2oLCqI5O/6znI=";
|
||||
vendorHash = "sha256-q9dB54s9LD0klbDW8bWlXmFzPIPrFBcWJrhYRkyKTp0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDprintPlugin }:
|
||||
mkDprintPlugin {
|
||||
description = "Biome (JS/TS/JSON) wrapper plugin";
|
||||
hash = "sha256-dcM4Z9QP0B+gp2MnQxTfjIykPYZdwPuKnQRjjpL5DV8=";
|
||||
hash = "sha256-KwmgD5VzU9m7jELeFAkSjS53B0fGVxZp8YvOG1nc8gM=";
|
||||
initConfig = {
|
||||
configExcludes = [ "**/node_modules" ];
|
||||
configKey = "biome";
|
||||
@@ -17,6 +17,6 @@ mkDprintPlugin {
|
||||
};
|
||||
pname = "dprint-plugin-biome";
|
||||
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.5.wasm";
|
||||
version = "0.12.5";
|
||||
url = "https://plugins.dprint.dev/biome-0.12.6.wasm";
|
||||
version = "0.12.6";
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gauge";
|
||||
version = "1.6.28";
|
||||
version = "1.6.29";
|
||||
|
||||
patches = [
|
||||
# adds a check which adds an error message when trying to
|
||||
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "getgauge";
|
||||
repo = "gauge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nbFhbM8YKdZdGkyfGRXK3bpxzijF4tRpU4afnGqigSk=";
|
||||
hash = "sha256-mZmIxss0W5eufz7EzchjVxdXpM/npbIBWls5C3KYVbY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nZPRjCzYSdtx6Q4VGdTunfK9+4X14l3gXwMLJc855JY=";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ghostfolio";
|
||||
version = "2.251.0";
|
||||
version = "2.252.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-wH4gX/0/MKgo6PX+PbwWss3FvdJN/tf8jFuFpfZIQ8s=";
|
||||
hash = "sha256-IR6/LTCBUfGweGA+cM/qfgK3i2ZUaV9u7K2XZH0Q0ZI=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Ml7vk1RtJKtE+QTEvKC/ZosIsCxgER5xN2IdSV/8yHg=";
|
||||
npmDepsHash = "sha256-2EGjP7PQVeWpXonAOM7JD3rRptyEbNgSGe1sTlV/ImM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma_6
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
{
|
||||
"version": "1.0.12",
|
||||
"version": "1.0.19",
|
||||
"x86_64-linux": {
|
||||
"name": "copilot-linux-x64",
|
||||
"hash": "sha256-QqFZO9BNWz+8e4BC9KtxYO9M3y5jey5sx7jMpx37WfY="
|
||||
"hash": "sha256-8ZlmXw8lIuTDFf59nl65g+Yg7CvJeyJJ1pGMaARz+bg="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"name": "copilot-linux-arm64",
|
||||
"hash": "sha256-IBJt89WfdXqT/7txzzvAXcQxwk04Fu3iWwbJOOD0b6w="
|
||||
"hash": "sha256-/hGO951vg8oWE3ONQ03Pa4yeMRqJaml5Q2J3YaMOzRI="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"name": "copilot-darwin-x64",
|
||||
"hash": "sha256-TGbWhAlLVs3oAPVwgBXQpmB/yPUYNjeZX8k32qcosJ4="
|
||||
"hash": "sha256-zsPRSgIe5h+EkKeqCPZZpQvmWgJpIXMg86YgvIIEHy4="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"name": "copilot-darwin-arm64",
|
||||
"hash": "sha256-mrCdZwv/f0MummttAvMxlJbAfolZaGqIG9Q+UToeYVM="
|
||||
"hash": "sha256-0hvupLiJbzc89Pw5u8DS9MS+1N4LEjkR3nx6U+AN78w="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,13 +35,13 @@ assert builtins.all (
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "github-runner";
|
||||
version = "2.332.0";
|
||||
version = "2.333.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jxeuyomWBzynwYHvmNi5CcP9+z2odl7W3uXOGVgv2PY=";
|
||||
hash = "sha256-5hSnveIebRQhvIHZc8sN9/8e9W1rlfITIB2uNMsQM6k=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
@@ -157,7 +157,9 @@ buildDotnetModule (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# tests fail with sandboxing under darwin
|
||||
__darwinAllowLocalNetworking = true;
|
||||
__noChroot = true;
|
||||
|
||||
# Fully qualified name of disabled tests
|
||||
disabledTests = [
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.7.18",
|
||||
"version": "1.7.20",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.7.18",
|
||||
"version": "1.7.20",
|
||||
"hasInstallScript": true,
|
||||
"license": "None",
|
||||
"dependencies": {
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "graphite-cli";
|
||||
version = "1.7.18";
|
||||
version = "1.7.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
|
||||
hash = "sha256-IDj1hahbggDZTxOpy+UsCuqmIDFZ0Ud8IjYxhlp1zl8=";
|
||||
hash = "sha256-Xzq6+fsWRPoiPxtk1zNARCkIPBu64ipAKqPVU2dnV9E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-6VYynLO3fH8B5MKcf7it/BGXBb7pLTD4NngjdzhJLso=";
|
||||
npmDepsHash = "sha256-6JzVDgrV5kUKES7/z+0aU+Rs6VabdKhcfru38j3Jmcw=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
|
||||
Generated
+52
-52
@@ -61,18 +61,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-S3YTzCZTqmHo0AtGbfzYySXnCmRFHF6KYNM+wuQlW6Q="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-Q+hF4swlFzafwMDnVSH/GwFBdwO3e+l3VYPcD/NStYw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.DataProtection",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-fdj7Ogh+Eq4DpoZQGuvU49tRbG7pbr5l/n1xHv91aMk="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-o854THp3eNnY+sJssLxNQtDbDrp21QX1TJurYWu04g4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.DataProtection.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-ik1OxpjTA6YvHY03C46ehfwCzctU3uxO77MpZN8j1s0="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-7muJ67Xvw4PynXKRDQZnLKwFdbGutkx/p3bJfxph2KM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Http",
|
||||
@@ -91,13 +91,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.JsonPatch",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-4PeCo0P5yp92lbowpTwYQoEucaQnheCjapcjDYYCa+Y="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-X7/fHaxXSbZCg5EKFLfX6tjDtOXpgiPNirF/ifaIy1E="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-Va5Z9cGbYzWHVAeHDTALM9+nuauZXkLfFW5RBjssyjo="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-kNNf6RnVm7SgT0eEBSPDE3nXRwxL3qYln6gGzIszKTc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.WebUtilities",
|
||||
@@ -126,8 +126,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-kWcD+J3uXlKaZLkG1n2QMFnKEWi5gSyJzcNWvc68knY="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-I2sbQ4JwlDU/ocYsfgq6XLd7FDTIqxqsl7Bq8k10m5U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.TimeProvider",
|
||||
@@ -146,8 +146,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-VFkOp9M/u1NbuxQH2nc7/JyC3LvlIxk4CHJ6tuG7BDc="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-WDOS1x9YpEsJ9z6xI4h6R+HGGck3l/5kHbQxzjMSfgk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
@@ -156,8 +156,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-FYIGDiv0aVApHCpoVQs4o9sWeFZhXb3XfK/zWXYlH1g="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-Ihhg9vZC4vWDQhZNSCSXF9Cdhd+IVCCy53WSVJk4Iaw="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -171,23 +171,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-EZt7Vjl0dll6GZOVCTfC2cYxAG5IWtJHeOGlDJ7rHTg="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-LF0CXHppSdguJ/zL14BuCxsJmOXgpC4sVcNlc+nME/A="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-4pejR//BfEIbjcH5+galqF7tMXlolBgVp7sHy4E2zoE="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-g8hikT/FfhWM5uzACl6n8AVb6BqVDAaSddZ/GoshUu8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-P6WRAZSAUbO6YlC6eB9BWGPqej3hJWwfALODqNvGebA="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-TjaYFKyoWJaf8XztRPp6pM+iAXE3tcA+EC2rdctWCH4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Hosting.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-t/7rol1scjtqAVk/MtEvItvI+Gl6ngRKgdsGDs5yFZY="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-S/InBEcgCmsWTVMFWTs6cYLYotMANuklDFD8psj8LWE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
@@ -201,8 +201,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-pl+0ezSkx+GND5pH2gtvhdMiCPodD1YvNP7wl4gDQt4="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-q24UO57BWHF0AED054nTAhNj6Sk1AaCVSMlvxl+kFo0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ObjectPool",
|
||||
@@ -221,8 +221,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-WuEpn1zvPWdS+TTu30s1Z3KMUt+4GpdwRpzqrhtfd60="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-EyDTvLfZmQOhJvvl6Um4fqHsF1+IxA4MXm13tw0kqgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
@@ -231,8 +231,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-aJBpI8kad6jm0Pno4WQWJZnbM2E3zayjfa8gvoMXI7I="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-FU5zzgkyZd4Js0lXUxKahID8M1u3Hty24IfN52tLT6M="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Net.Http.Headers",
|
||||
@@ -416,13 +416,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Polly",
|
||||
"version": "8.6.5",
|
||||
"hash": "sha256-2YRacrP3b3C6EBCb5Pjg6fQdGj+SgbTeaWHN/oZ1d8s="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
|
||||
},
|
||||
{
|
||||
"pname": "Polly.Core",
|
||||
"version": "8.6.5",
|
||||
"hash": "sha256-m12obNfMZdWQWJoCaF03H5qEbFDdp9FSdHTHcIIsACQ="
|
||||
"version": "8.6.6",
|
||||
"hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Collections",
|
||||
@@ -716,8 +716,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.EventLog",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-FQ0W9uvdNwW4zYPm8r436a6ThZ8fXNTuE2ByxWKhXrY="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-jnBBxxlKnFEC1K5oV0SIfb2xOY5tfRJg7dg+URYrYsA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.Tools",
|
||||
@@ -786,8 +786,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-QB79/Sv076sbhuam8IDCKsfYcZsGZtz53Hrg1XmJZFU="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-GWAPzaq4LYwmebixpiTn3TntDt3SjE04/DiFzd5P0Vc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq",
|
||||
@@ -971,8 +971,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Pkcs",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-x49sviUYfmI9m0Gm+a4vkTmHn5smecqwObmJ/mBh+xo="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-jQoOzArEHhUzbJI9GrEKn/EIUYj2KNRt0waZZDC5XaU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Primitives",
|
||||
@@ -986,8 +986,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.ProtectedData",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-QPL673ebdqDAXM+oB2GPhIV+y+/mMHd1mok55b+JEhE="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-oSzz/P2MujRav0fAEtJ4ahIi8Jc1i0SAXWNPMN2K1Ps="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.X509Certificates",
|
||||
@@ -996,8 +996,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Xml",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-iJiA1aqqv2cQmkZieje+AyVsLXtf78YjMvmO7tGiwlk="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-wa2dV3WvK+Bgqk4bRTOL9q4VtGHtoMr1nBuP3qVTpxE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Principal.Windows",
|
||||
@@ -1011,8 +1011,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.ServiceProcess.ServiceController",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-3emvlVHvUKQqX+pf50UonnrDghzq32C/Zh96Wcpg5nU="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-QBGEjsIV+VfL51qGaYo1PlsPHKZ6b71VinvF+2yK1oM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding",
|
||||
@@ -1021,8 +1021,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-RUOuo/Ti9orjkJsFbonY0CN/AstQKVBBQwn70W2G158="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-N5XNml7+QGIw61HcnntmtyILGWRxGNfJOhsuDFcxL0Q="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.Extensions",
|
||||
@@ -1036,13 +1036,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-hcHdVe/scC1VgitjHdx/zsG/YwZ3rMgRMCPAwsvG79s="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-snL0tLOiaom9pNPcbJ25xhq4Kqh66qwZH5s7Zyp32ZY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "9.0.12",
|
||||
"hash": "sha256-1YwyeEaYl6sju0ViAeAAdVqfE2uv8yZp/0gWf/30p2Q="
|
||||
"version": "9.0.14",
|
||||
"hash": "sha256-/y4PuhczVyM4GyC5mfv6NOsUCdfOMQNzr+4Ozch/Jw0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.RegularExpressions",
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.1066";
|
||||
version = "0.24.1542";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o0Mu5+m6+2iVRIJ8OIlUDNUY9h3qKn1hOsSA1JYd71o=";
|
||||
hash = "sha256-Sb6a7vIEzrdhMCiENvLcB1V5EhqYQkZ8GObXBoDJAcM=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@@ -21,9 +21,13 @@
|
||||
python3,
|
||||
qt6Packages,
|
||||
woff2,
|
||||
cargo,
|
||||
fast-float,
|
||||
ffmpeg,
|
||||
fmt,
|
||||
fontconfig,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
simdutf,
|
||||
skia,
|
||||
nixosTests,
|
||||
@@ -36,13 +40,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ladybird";
|
||||
version = "0-unstable-2026-02-14";
|
||||
version = "0-unstable-2026-04-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LadybirdBrowser";
|
||||
repo = "ladybird";
|
||||
rev = "ae9106a29da6b93695da2954e2a43b8ab2c2c112";
|
||||
hash = "sha256-cmF5YVnS2kwS3YghPFcuCAP9PWnDs6xbS8XkdH268Qc=";
|
||||
rev = "b11f30b32eff7c5e7baf6e84d0a432975631486d";
|
||||
hash = "sha256-Fv74py0dQG2hQti40eh7vXCkN0rkheeqQ/JM3KIuLDA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-5CB5mRdmvsmTmy3PGKhCx3NZm7Et2cIwIg9vF2wA7xE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -73,10 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
qt6Packages.wrapQtAppsHook
|
||||
libtommath
|
||||
];
|
||||
@@ -85,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curlFull
|
||||
fast-float
|
||||
ffmpeg
|
||||
fmt
|
||||
fontconfig
|
||||
libavif
|
||||
angle # libEGL
|
||||
|
||||
@@ -3,26 +3,31 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "markdown-code-runner";
|
||||
version = "0.3.2";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drupol";
|
||||
repo = "markdown-code-runner";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0AIW9rRIGKOCVdOmWH+vs4T3k++joo8DQpdiok6aAX0=";
|
||||
hash = "sha256-IMI9hjZDjgzReLIuNOISIkiLlPmnX+DWlrylP108wDc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q2KhNPrUU8X95Z7qsWqwkFDzJlLAmpH1Fn5f47fYr1o=";
|
||||
cargoHash = "sha256-aUbavxCObgZlhlv5DyoC/yAq79UM4tR77jwTsVqN4yU=";
|
||||
|
||||
dontUseCargoParallelTests = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Configurable Markdown code runner that executes and optionally replaces code blocks using external commands";
|
||||
longDescription = ''
|
||||
|
||||
@@ -11,19 +11,19 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "migrate-to-uv";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkniewallner";
|
||||
repo = "migrate-to-uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lmkSFCgp/JIRxa7LgkRXWZYVxVC2STcfoiIepMrQbcM=";
|
||||
hash = "sha256-gKiLGuHlUtSFdZCZZIxK7V6apvHMJ7sBZZo0auK4w2s=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src pname version;
|
||||
hash = "sha256-zRXOYJfMW8ocv92J05QpBlCbiCDHolEYhKlbyZLDp+w=";
|
||||
hash = "sha256-CZEZ1zLXAerUPgKRmzkN4Q3v/tNDI438V0yfYYZK+pQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "moor";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "moor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ldrXHJN9u+S0ogxmaJU6yqygL/f+cHPr0enOeqYy+EU=";
|
||||
hash = "sha256-qDUIgAGO4jUtyBeHSZ59+7bpLkNWIG8nH84nOGe5bUw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lz3cq2xL9byhLNbAwEvYOsP9WQsu0hqrWe2EDaLSeOQ=";
|
||||
vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nfs-ganesha";
|
||||
version = "9.9";
|
||||
version = "9.10";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "nfs-ganesha";
|
||||
repo = "nfs-ganesha";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-yr9rXdW1rNiYt3bc1Rj4mdQTx9SZX6kp7RbdODR1ck0=";
|
||||
hash = "sha256-9w7EVKTaQ7b3CT/APfvhEMLUE+CAg2L2G4qtrVAgxXc=";
|
||||
};
|
||||
|
||||
patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch;
|
||||
|
||||
@@ -94,7 +94,7 @@ let
|
||||
|
||||
cudaToolkit = buildEnv {
|
||||
# ollama hardcodes the major version in the Makefile to support different variants.
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.2/CMakePresets.json#L21-L47
|
||||
# - https://github.com/ollama/ollama/blob/v0.20.3/CMakePresets.json#L21-L47
|
||||
name = "cuda-merged-${cudaMajorVersion}";
|
||||
paths = map lib.getLib cudaLibs ++ [
|
||||
(lib.getOutput "static" cudaPackages.cuda_cudart)
|
||||
@@ -140,13 +140,13 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.20.2";
|
||||
version = "0.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ic3eLOohLR7MQGkLvDJBNOCiBBKxh6l8X9MgK0b4w+Y=";
|
||||
hash = "sha256-o9iCqdOfNMxfIyThQAOSSQZE2ZyBuyJWFr6wqvQo1A0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
|
||||
@@ -232,7 +232,7 @@ goBuild (finalAttrs: {
|
||||
'';
|
||||
|
||||
# ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
|
||||
# https://github.com/ollama/ollama/blob/v0.20.2/docs/development.md#library-detection
|
||||
# https://github.com/ollama/ollama/blob/v0.20.3/docs/development.md#library-detection
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r build/lib/ollama $out/lib/
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ord";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ordinals";
|
||||
repo = "ord";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-LP/Hgo7seXoNf0IHMpxd2euMmxH1usGCkuYMPmw6jn4=";
|
||||
hash = "sha256-KtJfiQs+2XkFT2l/rpyjeGf/i15BsLFHjSQjzOZkRfg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qJhTh6nXVlZJ3kAZN2hrZ6XDrv1dk45nX6KRSQ1EbS4=";
|
||||
cargoHash = "sha256-4OFkqErFQ/VPvcHdBJTt877wpd1tALTH89U9u1V2KyY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rehex";
|
||||
version = "0.63.4";
|
||||
version = "0.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = "rehex";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Iy87iEadK9fXApeYpJbG0jV437wGJxlOoiJLfaUTkVs=";
|
||||
hash = "sha256-X68wcKXtjHF8IaDM7qYEDFwxJwqG0cvpvSvyIgMd8kA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.1.62";
|
||||
version = "0.1.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+X/8Tc894lQkJBsRfr11TgSUejQZH90dRwPzTe7i9dw=";
|
||||
hash = "sha256-+oCgwNGLmntYLbXY1kYQMIQI4IdWOkNS7MBWWIY0I3o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w/MqjaxutaNy++nPEHWIfdaIB9YH+dAOYvFVAcFnrss=";
|
||||
cargoHash = "sha256-zIppcngdW7eKXuqA0BD4B7Qpt1EVL22IZHEXyuF6xIY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
libffi,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
@@ -9,20 +10,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustpython";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustPython";
|
||||
repo = "RustPython";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BYYqvPJu/eFJ9lt07A0p7pd8pGFccUe/okFqGEObhY4=";
|
||||
hash = "sha256-rjDJXXR1ByFubZtzy70DZKur6nqVmufd3TqwxN1s9kE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LuxET01n5drYmPXXhCl0Cs9yoCQKwWah8FWfmKmLdsg=";
|
||||
cargoHash = "sha256-I+yeaMN5wxt+l4I8qUPq2fk+OER8/QxeHAKtvvYIV9Y=";
|
||||
|
||||
# freeze the stdlib into the rustpython binary
|
||||
cargoBuildFlags = [ "--features=freeze-stdlib" ];
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
@@ -38,7 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "Python 3 interpreter in written Rust";
|
||||
homepage = "https://rustpython.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
maintainers = with lib.maintainers; [
|
||||
prusnak
|
||||
miniharinn
|
||||
];
|
||||
mainProgram = "rustpython";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
diff --git a/TESTING/traditional/EIG/CMakeLists.txt b/TESTING/traditional/EIG/CMakeLists.txt
|
||||
index 935646d..87b77b1 100644
|
||||
--- a/TESTING/traditional/EIG/CMakeLists.txt
|
||||
+++ b/TESTING/traditional/EIG/CMakeLists.txt
|
||||
@@ -21,12 +21,12 @@ add_executable(xztrd pztrddriver.f pzttrdtester.f pzlatran.f pztrdinfo.f pzhetdr
|
||||
add_executable(xssvd pssvddriver.f pslagge.f pssvdchk.f pssvdcmp.f pssvdtst.f ${smatgen})
|
||||
add_executable(xdsvd pdsvddriver.f pdlagge.f pdsvdchk.f pdsvdcmp.f pdsvdtst.f ${dmatgen})
|
||||
|
||||
-add_executable(xssep psseptst.f pssepsubtst.f pssepchk.f pssepqtq.f pslagsy.f pslatms.f pslasizesep.f pslasizesyevx.f pssepdriver.f pssepreq.f pssepinfo.f pslasizesyev.f pssqpsubtst.f pslasizesqp.f pssdpsubtst.f ${smatgen})
|
||||
+# add_executable(xssep psseptst.f pssepsubtst.f pssepchk.f pssepqtq.f pslagsy.f pslatms.f pslasizesep.f pslasizesyevx.f pssepdriver.f pssepreq.f pssepinfo.f pslasizesyev.f pssqpsubtst.f pslasizesqp.f pssdpsubtst.f ${smatgen})
|
||||
add_executable(xdsep pdseptst.f pdsepsubtst.f pdsepchk.f pdsepqtq.f pdlagsy.f pdlatms.f pdlasizesep.f pdlasizesyevx.f pdsepdriver.f pdsepreq.f pdsepinfo.f pdlasizesyev.f pdsqpsubtst.f pdlasizesqp.f pdsdpsubtst.f ${dmatgen})
|
||||
add_executable(xcsep pcseptst.f pcsepsubtst.f pcsepchk.f pcsepqtq.f pclagsy.f pclatms.f pclasizesep.f pclasizeheevx.f pcsepdriver.f pcsepreq.f pssepinfo.f pcsdpsubtst.f ${cmatgen})
|
||||
add_executable(xzsep pzseptst.f pzsepsubtst.f pzsepchk.f pzsepqtq.f pzlagsy.f pzlatms.f pzlasizesep.f pzlasizeheevx.f pzsepdriver.f pzsepreq.f pdsepinfo.f pzsdpsubtst.f ${zmatgen})
|
||||
|
||||
-add_executable(xsgsep psgseptst.f psgsepsubtst.f psgsepchk.f pslagsy.f pslatms.f pslasizesyevx.f pslasizegsep.f pslasizesep.f psgsepdriver.f psgsepreq.f pssepinfo.f ${smatgen})
|
||||
+# add_executable(xsgsep psgseptst.f psgsepsubtst.f psgsepchk.f pslagsy.f pslatms.f pslasizesyevx.f pslasizegsep.f pslasizesep.f psgsepdriver.f psgsepreq.f pssepinfo.f ${smatgen})
|
||||
add_executable(xdgsep pdgseptst.f pdgsepsubtst.f pdgsepchk.f pdlagsy.f pdlatms.f pdlasizesyevx.f pdlasizegsep.f pdlasizesep.f pdgsepdriver.f pdgsepreq.f pdsepinfo.f ${dmatgen})
|
||||
add_executable(xcgsep pcgseptst.f pcgsepsubtst.f pcgsepchk.f pclagsy.f pclatms.f pclasizegsep.f pclasizeheevx.f pclasizesep.f pcgsepdriver.f pcgsepreq.f pssepinfo.f ${cmatgen})
|
||||
add_executable(xzgsep pzgseptst.f pzgsepsubtst.f pzgsepchk.f pzlagsy.f pzlatms.f pzlasizegsep.f pzlasizeheevx.f pzlasizesep.f pzgsepdriver.f pzgsepreq.f pdsepinfo.f ${zmatgen})
|
||||
@@ -39,8 +39,8 @@ add_executable(xznep pznepdriver.f pznepinfo.f pznepfchk.f ${zmatgen})
|
||||
add_executable(xcevc pcevcdriver.f pcevcinfo.f pcget22.f ${cmatgen})
|
||||
add_executable(xzevc pzevcdriver.f pzevcinfo.f pzget22.f ${zmatgen})
|
||||
|
||||
-add_executable(xssyevr pslasizesepr.f pslasizesyevr.f psseprdriver.f psseprreq.f psseprsubtst.f
|
||||
-pssepchk.f pssepqtq.f pslatms.f psseprtst.f pssepinfo.f pslagsy.f pslasizesep.f ${smatgen})
|
||||
+# add_executable(xssyevr pslasizesepr.f pslasizesyevr.f psseprdriver.f psseprreq.f psseprsubtst.f
|
||||
+# pssepchk.f pssepqtq.f pslatms.f psseprtst.f pssepinfo.f pslagsy.f pslasizesep.f ${smatgen})
|
||||
add_executable(xdsyevr pdlasizesepr.f pdlasizesyevr.f pdseprdriver.f pdseprreq.f pdseprsubtst.f
|
||||
pdsepchk.f pdsepqtq.f pdlatms.f pdseprtst.f pdsepinfo.f pdlagsy.f pdlasizesep.f ${dmatgen})
|
||||
add_executable(xcheevr pclasizesepr.f pclasizeheevr.f pcseprdriver.f pcseprreq.f pcseprsubtst.f
|
||||
@@ -83,15 +83,12 @@ endforeach()
|
||||
set(test_set_4
|
||||
xssvd
|
||||
xdsvd
|
||||
- xssep
|
||||
xdsep
|
||||
xcsep
|
||||
xzsep
|
||||
- xsgsep
|
||||
xdgsep
|
||||
xcgsep
|
||||
xzgsep
|
||||
- xssyevr
|
||||
xdsyevr
|
||||
xcheevr
|
||||
xzheevr
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
gfortran,
|
||||
mpiCheckPhaseHook,
|
||||
@@ -16,13 +15,13 @@ assert blas.isILP64 == lapack.isILP64;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scalapack";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Reference-ScaLAPACK";
|
||||
repo = "scalapack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik=";
|
||||
hash = "sha256-cUdHC9DfJBSrxFVyCSSj9qxE5a+JFkI1W671iT7DP1M=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@@ -34,36 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "version-string";
|
||||
url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/76cc1ed3032e9a4158a4513c9047c3746b269f04.patch";
|
||||
hash = "sha256-kmllLa9GUeTrHRYeS0yIk9I8LwaIoEytdyQGRuinn3A=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "scalapack-fix-cmake-4.patch";
|
||||
url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/c3d6b22b0032fd2b8772d99c2239c18473e197a7.patch";
|
||||
hash = "sha256-935KtaqPO2cghbD9Z8YMxGGOQJo1D1LqTje6/IL4bGI=";
|
||||
})
|
||||
|
||||
# Fix build with gcc15
|
||||
# https://github.com/Reference-ScaLAPACK/scalapack/pull/139
|
||||
(fetchpatch {
|
||||
name = "scalapack-fix-function-declaration-arguments.patch";
|
||||
url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/0cd017afa3eefd0597cfe71b7bcfd6356a258da2.patch";
|
||||
hash = "sha256-uUdazKplDt8K5yuVaHX5pLFqDMh0F7eBBGEHfxOiM0Y=";
|
||||
})
|
||||
];
|
||||
# The xssep, xsgsep, and xsyevr tests need to be disabled for ILP64
|
||||
patches = lib.optional finalAttrs.passthru.isILP64 ./disable-tests-ilp64.patch;
|
||||
|
||||
# Required to activate ILP64.
|
||||
# See https://github.com/Reference-ScaLAPACK/scalapack/pull/19
|
||||
postPatch = lib.optionalString finalAttrs.passthru.isILP64 ''
|
||||
sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/EIG/* TESTING/LIN/*
|
||||
sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/*
|
||||
|
||||
# These tests are not adapted to ILP64
|
||||
sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt
|
||||
sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/traditional/EIG/* TESTING/traditional/LIN/*
|
||||
sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/traditional/EIG/* TESTING/traditional/LIN/*
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
@@ -105,14 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# sometimes fail due to this
|
||||
checkFlags = [ "ARGS=--timeout 10000" ];
|
||||
|
||||
postFixup = ''
|
||||
# _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated
|
||||
# cmake file will thus look for the library in the dev output instead of out.
|
||||
# Use the absolute path to $out instead to fix the issue.
|
||||
substituteInPlace $dev/lib/cmake/scalapack-${finalAttrs.version}/scalapack-targets-release.cmake \
|
||||
--replace-fail "\''${_IMPORT_PREFIX}" "$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.netlib.org/scalapack/";
|
||||
description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scipopt-scip";
|
||||
version = "10.0.1";
|
||||
version = "10.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "scip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YbPGJl2q9Ja1WRhcmpMJgmfE8crY/dH05ayj/N2pQAY=";
|
||||
hash = "sha256-8R9/6dTsTIcvp2pYWXlTh7WuzlotJb+y5hJpzY+r1pc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -36,20 +36,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2OBTX4Lh3dx7NbuWsvyB4FzXk6ywDcp6LswhlRlBjCI=";
|
||||
hash = "sha256-zVBsnVqm38mEROtRChiNh9bJ/e8BP09CSxVS1wHVYZQ=";
|
||||
};
|
||||
|
||||
kernel = buildGoModule {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-EfGCeVsD4yYUBEkSCbRdmMitZfJmQffcbScKaAOX+0o=";
|
||||
vendorHash = "sha256-nbHBBRSoFOm8/NJ+8ZsOJbHcTZ+Le0RCAbF1AKaPIbs=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-HKAK0XwudDuMk/1l6FH1h/FS0xUhzE0s37tpXDdtMU4=";
|
||||
hash = "sha256-TrdP871uy1Ie4MQiqC1/RaseU42FosOO7m4k+UVXGHc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/app";
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stellarium";
|
||||
version = "25.4";
|
||||
version = "26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stellarium";
|
||||
repo = "stellarium";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-DA4VuVTVGTTzZA9ml+sh6R2qUU+QhHD9k1qOb8C5sSA=";
|
||||
hash = "sha256-U7aiHkkIjUOxOU39u2yjFk5BDHvtKs8J3K1vz8Q2gxU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -39,7 +39,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wesnoth${suffix}";
|
||||
version = if enableDevel then "1.19.22" else "1.18.6";
|
||||
version = if enableDevel then "1.19.22" else "1.18.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wesnoth";
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
if enableDevel then
|
||||
"sha256-bqISxp20uiaqGwPshwe/xYwTnKC6K/FNYLE618L2IC4="
|
||||
else
|
||||
"sha256-y2ceN7rX8j+pNlaajw32ZxwFrUxqAuILADZvum03NhU=";
|
||||
"sha256-fODkyn4tyWL3PUVjXS4d7OW7VnQSL+fPaytvS8iigXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -36,13 +36,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zipline";
|
||||
version = "4.4.2";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diced";
|
||||
repo = "zipline";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RFajEXewnOCkp4xz/fhugVEt+BPNrrQY4Oeqt6Gg6p0=";
|
||||
hash = "sha256-StseTNZAmJzd+uk5FaBvDXr1wF/AahQp1GXFsZDzSz0=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm';
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-cYoZNalVDI1rLEYFLhJZ9pAZQCvieZL+Rj5VK7Q2/vk=";
|
||||
hash = "sha256-d1EvqV+WiLE4mzn4Ewpi9A42xxyIPMewB6CKpSnipi8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -2873,12 +2873,12 @@ with haskellLib;
|
||||
doJailbreak
|
||||
# 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
|
||||
(overrideSrc rec {
|
||||
version = "14.7";
|
||||
version = "14.8";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "PostgREST";
|
||||
repo = "postgrest";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Kr06TefPaeL4Nk1GKDbGFGgYQcS/e0A+Pn7pqGfdAlQ=";
|
||||
hash = "sha256-/tRYc6uIViHXnSMoNXElsgW6E+lNXesYk1LOKS6Tdkg=";
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
@@ -79,11 +79,13 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_barker"
|
||||
"test_mclmc"
|
||||
"test_mcse4"
|
||||
"test_mean_and_std"
|
||||
"test_normal_univariate"
|
||||
"test_nuts__with_device"
|
||||
"test_nuts__with_jit"
|
||||
"test_nuts__without_device"
|
||||
"test_nuts__without_jit"
|
||||
"test_smc__with_jit"
|
||||
"test_smc_waste_free__with_jit"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
syrupy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "great-tables";
|
||||
version = "0.21.0";
|
||||
pyproject = true;
|
||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "great-tables";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d5LKKA6KCkkBGibalWkfOTRzf48YEjdtjCdbGpW2AjE=";
|
||||
};
|
||||
|
||||
@@ -83,6 +83,10 @@ buildPythonPackage rec {
|
||||
"test_save_custom_webdriver"
|
||||
"test_save_image_file"
|
||||
"test_save_non_png"
|
||||
|
||||
# AssertionError: assert [- snapshot] == [+ received]
|
||||
# https://github.com/posit-dev/great-tables/issues/826
|
||||
"test_html_string_generated_inline_css"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Fails due to added newline in HTML output
|
||||
@@ -95,8 +99,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Library for rendering and formatting dataframes";
|
||||
homepage = "https://github.com/posit-dev/great-tables";
|
||||
changelog = "https://github.com/posit-dev/great-tables/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/posit-dev/great-tables/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "jupyter-collaboration-ui";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "jupyter_collaboration_ui";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-KpqOmQz10rp4+pkzRWhpHEaBXrcp4XM5JWzHplJioZY=";
|
||||
hash = "sha256-g16BhhTrOWRfL1g6V7IkbY0ez/T/0tSBq0pvayxFuZc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -38,24 +37,16 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "keras";
|
||||
version = "3.13.2";
|
||||
version = "3.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keras-team";
|
||||
repo = "keras";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7s3bJdkS/G/Ydj9txbtGrqGCE3PjjS1ZiuoGOzk+UIg=";
|
||||
hash = "sha256-EMwqo+0mIwjDY3wKW4idiAczSSPIGjTRNIYlqPDwd+w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "numpy-2.4-compat.patch";
|
||||
url = "https://github.com/keras-team/keras/commit/bc3bc4fc167049eb35136deaf5680cdaacc80371.patch";
|
||||
hash = "sha256-+eN3QVBpHGIv67hbRxzVHeKjFZIz5LCdbNO0AL65OoQ=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
@@ -95,6 +86,7 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
disabledTests = [
|
||||
# Require unpackaged `grain`
|
||||
"test_basics_grain"
|
||||
"test_fit_with_data_adapter_grain_dataloader"
|
||||
"test_fit_with_data_adapter_grain_datast"
|
||||
"test_fit_with_data_adapter_grain_datast_with_len"
|
||||
@@ -109,7 +101,13 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_image_dataset_from_directory_pad_to_aspect_ratio_grain"
|
||||
"test_image_dataset_from_directory_shuffle_grain"
|
||||
"test_image_dataset_from_directory_validation_split_grain"
|
||||
"test_no_targets_grain"
|
||||
"test_not_batched_grain"
|
||||
"test_sample_count_grain"
|
||||
"test_sampling_rate_grain"
|
||||
"test_sequence_stride_grain"
|
||||
"test_shuffle_grain"
|
||||
"test_start_and_end_index_grain"
|
||||
"test_text_dataset_from_directory_binary_grain"
|
||||
"test_text_dataset_from_directory_follow_links_grain"
|
||||
"test_text_dataset_from_directory_manual_labels_grain"
|
||||
@@ -117,6 +115,7 @@ buildPythonPackage (finalAttrs: {
|
||||
"test_text_dataset_from_directory_not_batched_grain"
|
||||
"test_text_dataset_from_directory_standalone_grain"
|
||||
"test_text_dataset_from_directory_validation_split_grain"
|
||||
"test_timeseries_regression_grain"
|
||||
|
||||
# Tries to install the package in the sandbox
|
||||
"test_keras_imports"
|
||||
@@ -132,8 +131,11 @@ buildPythonPackage (finalAttrs: {
|
||||
disabledTestPaths = [
|
||||
# Require unpackaged `grain`
|
||||
"keras/src/layers/preprocessing/data_layer_test.py"
|
||||
"keras/src/layers/preprocessing/discretization_test.py"
|
||||
"keras/src/layers/preprocessing/image_preprocessing/resizing_test.py"
|
||||
"keras/src/layers/preprocessing/rescaling_test.py"
|
||||
"keras/src/layers/preprocessing/string_lookup_test.py"
|
||||
"keras/src/layers/preprocessing/text_vectorization_test.py"
|
||||
"keras/src/trainers/data_adapters/grain_dataset_adapter_test.py"
|
||||
|
||||
# These tests succeed when run individually, but crash within the full test suite:
|
||||
|
||||
@@ -52,7 +52,7 @@ let
|
||||
|
||||
isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tensorflow" + lib.optionalString cudaSupport "-gpu";
|
||||
version = packages."${"version" + lib.optionalString isCudaJetson "_jetson"}";
|
||||
format = "wheel";
|
||||
@@ -73,9 +73,20 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals cudaSupport [ addDriverRunpath ]
|
||||
++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath ];
|
||||
lib.optionals cudaSupport [
|
||||
addDriverRunpath
|
||||
]
|
||||
++ lib.optionals isCudaJetson [
|
||||
cudaPackages.autoAddCudaCompatRunpath
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"libclang"
|
||||
"keras"
|
||||
];
|
||||
pythonRelaxDeps = [
|
||||
"h5py"
|
||||
];
|
||||
dependencies = [
|
||||
absl-py
|
||||
astunparse
|
||||
@@ -99,11 +110,6 @@ buildPythonPackage rec {
|
||||
]
|
||||
++ lib.optional (!isPy3k) mock;
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"libclang"
|
||||
"keras"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
unset SOURCE_DATE_EPOCH
|
||||
|
||||
@@ -125,13 +131,13 @@ buildPythonPackage rec {
|
||||
# Then, in each package requiring `tensorflow`, our pythonRuntimeDepsCheck will fail with:
|
||||
# importlib.metadata.PackageNotFoundError: No package metadata was found for tensorflow
|
||||
# Hence, we manually rename the package to `tensorflow`.
|
||||
lib.optionalString ((builtins.match ".*tensorflow_cpu.*" src.url) != null) ''
|
||||
lib.optionalString ((builtins.match ".*tensorflow_cpu.*" finalAttrs.src.url) != null) ''
|
||||
(
|
||||
cd $out/${python.sitePackages}
|
||||
|
||||
dest="tensorflow-${version}.dist-info"
|
||||
dest="tensorflow-${finalAttrs.version}.dist-info"
|
||||
|
||||
mv tensorflow_cpu-${version}.dist-info "$dest"
|
||||
mv tensorflow_cpu-${finalAttrs.version}.dist-info "$dest"
|
||||
|
||||
(
|
||||
cd "$dest"
|
||||
@@ -169,18 +175,23 @@ buildPythonPackage rec {
|
||||
# TODO: Create this list programmatically, and remove paths that aren't
|
||||
# actually needed.
|
||||
rrPathArr=(
|
||||
"$out/${python.sitePackages}/tensorflow/"
|
||||
"$out/${python.sitePackages}/tensorflow.libs"
|
||||
"$out/${python.sitePackages}/tensorflow"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/mlir/lite/python"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/mlir/quantization/tensorflow/python"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/mlir/stablehlo"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/mlir/tensorflow_to_stablehlo/python"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops"
|
||||
"$out/${python.sitePackages}/tensorflow/core/kernels"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/mlir/stablehlo/"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt/"
|
||||
"$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops/"
|
||||
"$out/${python.sitePackages}/tensorflow/include/external/ml_dtypes/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/metrics/"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/optimize/"
|
||||
"$out/${python.sitePackages}/tensorflow/python/"
|
||||
"$out/${python.sitePackages}/tensorflow/include/external/ml_dtypes"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/metrics"
|
||||
"$out/${python.sitePackages}/tensorflow/lite/python/optimize"
|
||||
"$out/${python.sitePackages}/tensorflow/python"
|
||||
"$out/${python.sitePackages}/tensorflow/python/autograph/impl/testing"
|
||||
"$out/${python.sitePackages}/tensorflow/python/client"
|
||||
"$out/${python.sitePackages}/tensorflow/python/data/experimental/service"
|
||||
@@ -191,9 +202,9 @@ buildPythonPackage rec {
|
||||
"$out/${python.sitePackages}/tensorflow/python/platform"
|
||||
"$out/${python.sitePackages}/tensorflow/python/profiler/internal"
|
||||
"$out/${python.sitePackages}/tensorflow/python/saved_model"
|
||||
"$out/${python.sitePackages}/tensorflow/python/tpu"
|
||||
"$out/${python.sitePackages}/tensorflow/python/util"
|
||||
"$out/${python.sitePackages}/tensorflow/tsl/python/lib/core"
|
||||
"$out/${python.sitePackages}/tensorflow.libs/"
|
||||
"${rpath}"
|
||||
)
|
||||
|
||||
@@ -217,14 +228,6 @@ buildPythonPackage rec {
|
||||
ln -s ${cudaPackages.cuda_nvcc} "$out/${python.sitePackages}/tensorflow/cuda"
|
||||
'';
|
||||
|
||||
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
|
||||
# and the propagated input tensorboard, which causes environment collisions.
|
||||
# Another possibility would be to have tensorboard only in the buildInputs
|
||||
# See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
|
||||
postInstall = ''
|
||||
rm $out/bin/tensorboard
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tensorflow"
|
||||
"tensorflow.python"
|
||||
@@ -241,4 +244,4 @@ buildPythonPackage rec {
|
||||
# unsupported combination
|
||||
broken = stdenv.hostPlatform.isDarwin && cudaSupport;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,88 +1,72 @@
|
||||
{
|
||||
version = "2.20.0";
|
||||
version = "2.21.0";
|
||||
version_jetson = "2.16.1+nv24.08";
|
||||
x86_64-linux_39 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1nxmm37miz0kzq8g2zc5f9w5vaiz0m75g2q97v19f0pnpl4q1kwh";
|
||||
};
|
||||
x86_64-linux_310 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "10y5s4bd1s4yk9qx71ap743l8l17axvj5lk49f4fwhq584wg4ghs";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow_cpu-2.21.0-cp310-cp310-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "10sbn67bm17mhbn8vbv87b2hxz9frmrqzjpa4vxcsq86bhpyjhyi";
|
||||
};
|
||||
x86_64-linux_311 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1077zld9n53w72sbvzll2ic1f05liy2jrbfhnlm98vi55nz6nxfg";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow_cpu-2.21.0-cp311-cp311-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "0v2vdqp269xy4d6n351wdhcs1njh6apishwixlqpgvh2gchpv11b";
|
||||
};
|
||||
x86_64-linux_312 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "19yn5ligcazva59bgw7v6pdl2wp7xz9i9qf4jpnr9041hm0j5af7";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow_cpu-2.21.0-cp312-cp312-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "1jr0z3hgbf83wpxrgspl1a1hcdvpic3ikvmnjr92vr1h579szj6w";
|
||||
};
|
||||
x86_64-linux_313 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1db4gipi9x05r4fbdj98p3bk6pz0zq25xi15c97ch3p1wn8pfvns";
|
||||
};
|
||||
x86_64-linux_39_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1hwfakj3b5w0lc641bqqcnxhdd47037998aqs57valzw7mc5rsqd";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow_cpu-2.21.0-cp313-cp313-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "14vp3parbn85lkczwiqggcd8709rgr87p32rnl8fjkazsck7rbq5";
|
||||
};
|
||||
x86_64-linux_310_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "07jr5bpvmxd3yjw3v2jd9i3jswlsfxr26604r16ka38f04x7zgbs";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp310-cp310-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "191kjb4p35xbvffmlff1j9pcqc3mv7w30zfx7hl1vslmwscg5ikp";
|
||||
};
|
||||
x86_64-linux_311_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "17i2z37jrji8rk11pspmlkd8r297x3an3gj5i7g86ic21zyrj528";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp311-cp311-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "097iamhva8rypzzvqfxm9y0fi5m1b3cwprhsnw85h8q4pb4znmlh";
|
||||
};
|
||||
x86_64-linux_312_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "1v2jkhglfrh4by86nri7zq4shi2gl920rilw3r5xbq17ql5mn9i5";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp312-cp312-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "1h0kpc9kflb1xr26ibw4xhbz6hp1rcsznf4rhcjvj3p7qi1mdfdk";
|
||||
};
|
||||
x86_64-linux_313_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
|
||||
sha256 = "0wkklfh0ny4y4lzac540v8g745b5adyzp29bi2cmmxr606dp58sz";
|
||||
};
|
||||
aarch64-linux_39 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
sha256 = "1pzbi2calx0crx8f0ff1kbibn1j5wwjbvpp9rsmqxja9j9sk7g18";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp313-cp313-manylinux_2_27_x86_64.whl";
|
||||
sha256 = "01jljjx1n46x57d6n33fgs86y09gmxqblcph8pxhwrdrra6xmn79";
|
||||
};
|
||||
aarch64-linux_310 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
sha256 = "1sms3c4mxy892gaa066nx4xa6m28rhigdav6bc9bgj7mjhyjk802";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp310-cp310-manylinux_2_27_aarch64.whl";
|
||||
sha256 = "0pcskswb7v82282w4mmj5smy5pmwbbw336b1x05chw6g4n5r75vw";
|
||||
};
|
||||
aarch64-linux_311 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
sha256 = "1mfflmpmywqihd1mdwcq6jnzgsv2khkf68z2dckc01fbxz46i59y";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp311-cp311-manylinux_2_27_aarch64.whl";
|
||||
sha256 = "0p7bwqxrz2xc6a3akpqg9l7x5hw4qh20qwkzqgqkqyjjdnhsq92b";
|
||||
};
|
||||
aarch64-linux_312 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
sha256 = "13q71s5gjb405s48maqz4sckwx971lwj5sg1bz2gyaz2s0yzpyrb";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp312-cp312-manylinux_2_27_aarch64.whl";
|
||||
sha256 = "0ljmpixm6b4m5691nlnw5288xq8v9fagfzkcwfc3hlq6firiazdh";
|
||||
};
|
||||
aarch64-linux_313 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
sha256 = "09nrnffmqdfr9zy5l1li0727b02drlz4p2dlfx4ss7kzl02qxj27";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp313-cp313-manylinux_2_27_aarch64.whl";
|
||||
sha256 = "1q4kln5iwcy37lgka8b5iqmcbk5pagqs688h4l62328iigxvs2m1";
|
||||
};
|
||||
aarch64-linux_310_jetson = {
|
||||
url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl";
|
||||
sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f";
|
||||
};
|
||||
aarch64-darwin_39 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-macosx_12_0_arm64.whl";
|
||||
sha256 = "0g3qg53l8pfna5r964s08das8jsijbg81snb8ny3z79034dvsv56";
|
||||
};
|
||||
aarch64-darwin_310 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-macosx_12_0_arm64.whl";
|
||||
sha256 = "0msk3aw06q46n4ng8i5cs79r6bhmmvqcam78pdav42hkypw6kwg5";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp310-cp310-macosx_12_0_arm64.whl";
|
||||
sha256 = "0rgm8wbcf7pg4vagfzj0k7l59hd8hrxwh25jalacxsg0i4l66qk4";
|
||||
};
|
||||
aarch64-darwin_311 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-macosx_12_0_arm64.whl";
|
||||
sha256 = "1visqvq280k4cgmg6hwphfkq54p8kdrnnsi4baw0jp83qlb415jz";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp311-cp311-macosx_12_0_arm64.whl";
|
||||
sha256 = "126a8gmjq8dn784gyh5z943ghxjqqyj75k10g7y0378k0r46zx2i";
|
||||
};
|
||||
aarch64-darwin_312 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-macosx_12_0_arm64.whl";
|
||||
sha256 = "13vcl3wcgaid8f2rdzvzmkfbdl3hhkh7qlwdy88apmrg4gq25caj";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp312-cp312-macosx_12_0_arm64.whl";
|
||||
sha256 = "04npxa04fv5gv5y3djwjmjakkz7rbfvm0kb9y8fvxb19fkadgv2n";
|
||||
};
|
||||
aarch64-darwin_313 = {
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-macosx_12_0_arm64.whl";
|
||||
sha256 = "19g8kk7f7ylx1y7awpc3afw7hp50sid2ka0jd9fdmh1q7dhhnzqr";
|
||||
url = "https://storage.googleapis.com/tensorflow/versions/%222.21.0%22/tensorflow-2.21.0-cp313-cp313-macosx_12_0_arm64.whl";
|
||||
sha256 = "1x279567yrwpvn1iylg5qxnzqsjgmw60fvciz71vg4l1qm3fsid1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,32 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
version="2.20.0"
|
||||
version="2.21.0"
|
||||
version_jetson="2.16.1+nv24.08"
|
||||
|
||||
bucket="https://storage.googleapis.com/tensorflow/versions/${version}"
|
||||
bucket="https://storage.googleapis.com/tensorflow/versions/%22${version}%22"
|
||||
bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow"
|
||||
|
||||
# List of binary wheels for Tensorflow. The most recent versions can be found
|
||||
# on the following page:
|
||||
# https://www.tensorflow.org/install/pip?lang=python3#package_location
|
||||
url_and_key_list=(
|
||||
"x86_64-linux_39 $bucket/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_310 $bucket/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_311 $bucket/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_312 $bucket/tensorflow_cpu-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_313 $bucket/tensorflow_cpu-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_39_gpu $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_310_gpu $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_311_gpu $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_312_gpu $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"x86_64-linux_313_gpu $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
|
||||
"aarch64-linux_39 $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
|
||||
"aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
|
||||
"aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
|
||||
"aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
|
||||
"aarch64-linux_313 $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
|
||||
"x86_64-linux_310 $bucket/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_311 $bucket/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_312 $bucket/tensorflow_cpu-${version}-cp312-cp312-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_313 $bucket/tensorflow_cpu-${version}-cp313-cp313-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_310_gpu $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_311_gpu $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_312_gpu $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_27_x86_64.whl"
|
||||
"x86_64-linux_313_gpu $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_27_x86_64.whl"
|
||||
"aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_27_aarch64.whl"
|
||||
"aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_27_aarch64.whl"
|
||||
"aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_27_aarch64.whl"
|
||||
"aarch64-linux_313 $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_27_aarch64.whl"
|
||||
"aarch64-linux_310_jetson $bucket_jetson/tensorflow-${version_jetson}-cp310-cp310-linux_aarch64.whl"
|
||||
"aarch64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin_312 $bucket/tensorflow-${version}-cp312-cp312-macosx_12_0_arm64.whl"
|
||||
|
||||
@@ -16,15 +16,15 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tf-keras";
|
||||
version = "2.20.1";
|
||||
inherit (tensorflow) version;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tf_keras";
|
||||
inherit version;
|
||||
hash = "sha256-iEvlk4+wsrU7FYPBritmDvhyFTd8KbW2p3/SIbRyrq8=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-+a8PJUbNVTLeD656SB80ocoiU3N9TNEAD2txPccz93A=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -47,4 +47,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "ollo69";
|
||||
domain = "smartthinq_sensors";
|
||||
version = "0.41.2";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
repo = "ha-smartthinq-sensors";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HNhW72aoYu0Vosq8o0lyxDse8jcs3kVWEzDw/5VQn9g=";
|
||||
hash = "sha256-ks1feF4TjzQaI6r6HzZ2cXPcUO+yMoeav34C/2jlH3k=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
+3
-3
@@ -6,17 +6,17 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "versatile-thermostat-ui-card";
|
||||
version = "1.1.4";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmcollin78";
|
||||
repo = "versatile-thermostat-ui-card";
|
||||
rev = "${version}";
|
||||
hash = "sha256-4v1Tl3GQagQd1H+CFBG+OuRl2zfz5vvyWRy7oBSpxfM=";
|
||||
hash = "sha256-z0m9Ewgh9eaN4cd+H0cuIYoeNjxyfm5FiP4kblQVKXs=";
|
||||
};
|
||||
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmDepsHash = "sha256-TlJGO0kw3+8ukT1DERp/xDwmeSu0ofP5mqrmXmGcF2M=";
|
||||
npmDepsHash = "sha256-5g+biez7e4+1YIrnHfBhN4+LeHF6motEX+1wl7NJdJI=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -9,79 +9,73 @@
|
||||
postgresql,
|
||||
}:
|
||||
|
||||
let
|
||||
# https://github.com/paradedb/paradedb/blob/v0.22.1/Cargo.lock#L4239-L4269
|
||||
linderaVersion = "1.4.1";
|
||||
linderaWebsite = "https://lindera.dev";
|
||||
|
||||
# pg_search's tokenizer uses several language dictionaries used by the Lindera crate
|
||||
dictionaries = {
|
||||
# https://github.com/lindera/lindera/blob/v1.4.1/lindera-ko-dic/build.rs#L15-L22
|
||||
lindera-ko-dic = rec {
|
||||
language = "Korean";
|
||||
filename = "mecab-ko-dic-2.1.1-20180720.tar.gz";
|
||||
source = fetchurl {
|
||||
url = "${linderaWebsite}/${filename}";
|
||||
hash = "sha256-cCztIcYWfp2a68Z0q17lSvWNREOXXylA030FZ8AgWRo=";
|
||||
};
|
||||
};
|
||||
|
||||
# https://github.com/lindera/lindera/blob/v1.4.1/lindera-cc-cedict/build.rs#L15-L22
|
||||
lindera-cc-cedict = rec {
|
||||
language = "Chinese";
|
||||
filename = "CC-CEDICT-MeCab-0.1.0-20200409.tar.gz";
|
||||
source = fetchurl {
|
||||
url = "${linderaWebsite}/${filename}";
|
||||
hash = "sha256-7Tz54+yKgGR/DseD3Ana1DuMytLplPXqtv8TpB0JFsg=";
|
||||
};
|
||||
};
|
||||
|
||||
# https://github.com/lindera/lindera/blob/v1.4.1/lindera-ipadic/build.rs#L15-L22
|
||||
lindera-ipadic = rec {
|
||||
language = "Japanese";
|
||||
filename = "mecab-ipadic-2.7.0-20250920.tar.gz";
|
||||
source = fetchurl {
|
||||
url = "${linderaWebsite}/${filename}";
|
||||
hash = "sha256-p7qfZF/+cJTlauHEqB0QDfj7seKLvheSYi6XKOFi2z0=";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPgrxExtension (finalAttrs: {
|
||||
pname = "pg_search";
|
||||
version = "0.22.4";
|
||||
version = "0.22.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradedb";
|
||||
repo = "paradedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WPkgVqrA2mOgj7IGh/GSjpJoLP7usdUWbFVY1SqGHq4=";
|
||||
hash = "sha256-b5sdKEWy4/uXLIE6HtcRMihtRK9iO9jM8pvktO3rOUU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-f8/5wDle97O3RoIvM+iPWeEzfASsaQm2k8YnaYg32Do=";
|
||||
cargoHash = "sha256-Umbx1ZrQEYifp09+unfaN/MBcbSq16NcqhP6h703Sb8=";
|
||||
|
||||
inherit postgresql;
|
||||
|
||||
# Lindera dictionaries are copied to a temporary directory and the
|
||||
# LINDERA_CACHE environment variable prevents the build.rs files in
|
||||
# the Lindera crates from downloading their dictionary from an
|
||||
# external URL, which doesn't work in the Nix sandbox
|
||||
preConfigure = ''
|
||||
export LINDERA_CACHE=$TMPDIR/lindera-cache
|
||||
mkdir -p $LINDERA_CACHE/${linderaVersion}
|
||||
preConfigure =
|
||||
let
|
||||
# Lindera dictionaries are copied to a temporary directory and the
|
||||
# LINDERA_CACHE environment variable prevents the build.rs files in
|
||||
# the Lindera crates from downloading their dictionary from an
|
||||
# external URL, which doesn't work in the Nix sandbox.
|
||||
|
||||
${lib.concatMapStringsSep "\n" (dict: ''
|
||||
echo "Copying ${dict.language} dictionary to Lindera cache"
|
||||
cp ${dict.source} $LINDERA_CACHE/${linderaVersion}/${dict.filename}
|
||||
'') (lib.attrValues dictionaries)}
|
||||
# You can see which Lindera version pg_search is using here:
|
||||
# https://github.com/paradedb/paradedb/tree/${version}/Cargo.lock
|
||||
linderaVersion = "1.5.1";
|
||||
|
||||
echo "Lindera cache prepared at $LINDERA_CACHE"
|
||||
'';
|
||||
# pg_search's tokenizer uses several language dictionaries used by the Lindera crate
|
||||
# Check the relevant build.rs files to get the proper URLs:
|
||||
# https://github.com/lindera/lindera/blob/${linderaVersion}/${dictionaryKey}/build.rs
|
||||
# Here's an example URL:
|
||||
# https://github.com/lindera/lindera/blob/v1.5.1/lindera-cc-cedict/build.rs
|
||||
|
||||
# https://github.com/paradedb/paradedb/blob/v0.22.1/Cargo.toml#L38-L39
|
||||
dict = language: filename: hash: {
|
||||
inherit filename language;
|
||||
source = fetchurl {
|
||||
url = "https://lindera.dev/${filename}";
|
||||
inherit hash;
|
||||
};
|
||||
};
|
||||
|
||||
dictionaries = {
|
||||
lindera-ko-dic =
|
||||
dict "Korean" "mecab-ko-dic-2.1.1-20180720.tar.gz"
|
||||
"sha256-cCztIcYWfp2a68Z0q17lSvWNREOXXylA030FZ8AgWRo=";
|
||||
lindera-cc-cedict =
|
||||
dict "Chinese" "CC-CEDICT-MeCab-0.1.0-20200409.tar.gz"
|
||||
"sha256-7Tz54+yKgGR/DseD3Ana1DuMytLplPXqtv8TpB0JFsg=";
|
||||
lindera-ipadic =
|
||||
dict "Japanese" "mecab-ipadic-2.7.0-20250920.tar.gz"
|
||||
"sha256-p7qfZF/+cJTlauHEqB0QDfj7seKLvheSYi6XKOFi2z0=";
|
||||
};
|
||||
in
|
||||
''
|
||||
export LINDERA_CACHE=$TMPDIR/lindera-cache
|
||||
mkdir -p $LINDERA_CACHE/${linderaVersion}
|
||||
${lib.concatMapStringsSep "\n" (dict: ''
|
||||
echo "Copying ${dict.language} dictionary to Lindera cache"
|
||||
cp ${dict.source} $LINDERA_CACHE/${linderaVersion}/${dict.filename}
|
||||
'') (lib.attrValues dictionaries)}
|
||||
echo "Lindera cache prepared at $LINDERA_CACHE"
|
||||
'';
|
||||
|
||||
# To determinate which version of cargo-pgrx to use, consult the project's main Cargo.toml:
|
||||
# https://github.com/paradedb/paradedb/tree/${version}/Cargo.toml
|
||||
# In that file, check the version of pgrx and pgrx-tests under workspace.dependencies
|
||||
cargo-pgrx = cargo-pgrx_0_17_0;
|
||||
|
||||
# https://github.com/paradedb/paradedb/tree/v0.22.1/pg_search
|
||||
cargoPgrxFlags = [
|
||||
"--package"
|
||||
"pg_search"
|
||||
@@ -102,7 +96,8 @@ buildPgrxExtension (finalAttrs: {
|
||||
changelog = "https://github.com/paradedb/paradedb/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = [ lib.maintainers.lucperkins ];
|
||||
# https://github.com/paradedb/paradedb/blob/v0.22.1/pg_search/Cargo.toml#L14-L17
|
||||
# For a list of versions, look under the features dictionary in:
|
||||
# https://github.com/paradedb/paradedb/tree/${version}/pg_search/Cargo.toml
|
||||
broken = lib.versionOlder postgresql.version "15";
|
||||
platforms = postgresql.meta.platforms;
|
||||
};
|
||||
|
||||
@@ -9281,7 +9281,7 @@ with pkgs;
|
||||
bitwig-studio-unwrapped = bitwig-studio5-unwrapped;
|
||||
};
|
||||
|
||||
bitwig-studio = bitwig-studio5;
|
||||
bitwig-studio = bitwig-studio6;
|
||||
|
||||
blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
|
||||
inherit (haskellPackages) ghcWithPackages;
|
||||
|
||||
Reference in New Issue
Block a user