Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
K900
@@ -10138,6 +10138,12 @@
|
||||
githubId = 44377258;
|
||||
name = "Heitor Augusto";
|
||||
};
|
||||
heitorPB = {
|
||||
email = "heitorpbittencourt@gmail.com";
|
||||
github = "heitorPB";
|
||||
githubId = 13461702;
|
||||
name = "Heitor Pascoal de Bittencourt";
|
||||
};
|
||||
hekazu = {
|
||||
name = "Henri Peurasaari";
|
||||
email = "henri.peurasaari@helsinki.fi";
|
||||
@@ -21152,6 +21158,13 @@
|
||||
githubId = 2141853;
|
||||
name = "Bang Lee";
|
||||
};
|
||||
qweered = {
|
||||
email = "grubian2@gmail.com";
|
||||
github = "qweered";
|
||||
githubId = 41731334;
|
||||
name = "Aliaksandr Samatyia";
|
||||
keys = [ { fingerprint = "4D3C 1993 340D 0ACE F6AF 1903 CACB 28BA 93CE 71A2"; } ];
|
||||
};
|
||||
qxrein = {
|
||||
email = "mnv07@proton.me";
|
||||
github = "qxrein";
|
||||
|
||||
@@ -414,7 +414,14 @@ in
|
||||
declarativePlugins = mkOption {
|
||||
type = with types; nullOr (listOf path);
|
||||
default = null;
|
||||
description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed.";
|
||||
description = ''
|
||||
If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot
|
||||
be manually installed.
|
||||
|
||||
Keep in mind that this turns off drilldown: for this to work, you need to add
|
||||
`grafana-metricsdrilldown-app`, `grafana-lokiexplore-app`, `grafana-exploretraces-app`
|
||||
and `grafana-pyroscope-app` to this option.
|
||||
'';
|
||||
example = literalExpression "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]";
|
||||
# Make sure each plugin is added only once; otherwise building
|
||||
# the link farm fails, since the same path is added multiple
|
||||
|
||||
@@ -66,6 +66,33 @@ let
|
||||
"wireguard" = [ "wireguard" ];
|
||||
"xfrm" = [ "xfrm_interface" ];
|
||||
};
|
||||
# https://github.com/systemd/systemd/blob/main/units/systemd-networkd.service.in
|
||||
commonServiceConfig = {
|
||||
after = [
|
||||
"systemd-udevd.service"
|
||||
"network-pre.target"
|
||||
"systemd-sysusers.service"
|
||||
"systemd-sysctl.service"
|
||||
];
|
||||
before = [
|
||||
"network.target"
|
||||
"multi-user.target"
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
conflicts = [
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
wants = [
|
||||
"network.target"
|
||||
];
|
||||
|
||||
unitConfig = {
|
||||
# Avoid default dependencies like "basic.target", which prevents ifstate from starting before luks is unlocked.
|
||||
DefaultDependencies = "no";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ marcel ];
|
||||
@@ -150,31 +177,12 @@ in
|
||||
etc."ifstate/ifstate.yaml".source = settingsFormat.generate "ifstate.yaml" cfg.settings cfg.package;
|
||||
};
|
||||
|
||||
systemd.services.ifstate = {
|
||||
systemd.services.ifstate = commonServiceConfig // {
|
||||
description = "IfState";
|
||||
|
||||
wantedBy = [
|
||||
"multi-user.target"
|
||||
];
|
||||
after = [
|
||||
"systemd-udevd.service"
|
||||
"network-pre.target"
|
||||
"systemd-sysusers.service"
|
||||
"systemd-sysctl.service"
|
||||
];
|
||||
before = [
|
||||
"network.target"
|
||||
"multi-user.target"
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
conflicts = [
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
wants = [
|
||||
"network.target"
|
||||
];
|
||||
|
||||
# mount is always available on nixos, avoid adding additional store paths to the closure
|
||||
path = [ "/run/wrappers" ];
|
||||
@@ -254,31 +262,23 @@ in
|
||||
)
|
||||
];
|
||||
|
||||
services.ifstate-initrd = {
|
||||
# https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/boot/networkd.nix#L3444
|
||||
additionalUpstreamUnits = [
|
||||
"network-online.target"
|
||||
"network-pre.target"
|
||||
"network.target"
|
||||
"nss-lookup.target"
|
||||
"nss-user-lookup.target"
|
||||
"remote-fs-pre.target"
|
||||
"remote-fs.target"
|
||||
];
|
||||
|
||||
services.ifstate-initrd = commonServiceConfig // {
|
||||
description = "IfState initrd";
|
||||
|
||||
wantedBy = [
|
||||
"initrd.target"
|
||||
];
|
||||
after = [
|
||||
"systemd-udevd.service"
|
||||
"network-pre.target"
|
||||
"systemd-sysusers.service"
|
||||
"systemd-sysctl.service"
|
||||
];
|
||||
before = [
|
||||
"network.target"
|
||||
"multi-user.target"
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
conflicts = [
|
||||
"shutdown.target"
|
||||
"initrd-switch-root.target"
|
||||
];
|
||||
wants = [
|
||||
"network.target"
|
||||
];
|
||||
|
||||
# mount is always available on nixos, avoid adding additional store paths to the closure
|
||||
# https://github.com/NixOS/nixpkgs/blob/2b8e2457ebe576ebf41ddfa8452b5b07a8d493ad/nixos/modules/system/boot/systemd/initrd.nix#L550-L551
|
||||
@@ -291,9 +291,6 @@ in
|
||||
# Otherwise systemd starts ifstate again, after the encryption password was entered by the user
|
||||
# and we are able to implement the cleanup using ExecStop rather than a separate unit.
|
||||
RemainAfterExit = true;
|
||||
# When using network namespaces pyroute2 expects this directory to exists.
|
||||
# @liske is currently investigating whether this should be considered a bug in pyroute2.
|
||||
ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} /var/run";
|
||||
ExecStart = "${lib.getExe initrdCfg.package} --config ${
|
||||
config.environment.etc."ifstate/ifstate.initrd.yaml".source
|
||||
} apply";
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Modular audio codec server";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
teams = [ teams.c3d2 ];
|
||||
mainProgram = "codecserver";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
runtimeShell,
|
||||
buildPackages,
|
||||
gettext,
|
||||
pkg-config,
|
||||
@@ -18,8 +17,8 @@
|
||||
libv4l,
|
||||
net-snmp,
|
||||
curl,
|
||||
systemd,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
systemdLibs,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
|
||||
libxml2,
|
||||
poppler,
|
||||
gawk,
|
||||
@@ -42,14 +41,14 @@
|
||||
scanSnapDriversPackage ? sane-drivers.epjitsu,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sane-backends";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sane-project";
|
||||
repo = "backends";
|
||||
rev = "refs/tags/${version}";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-e7Wjda+CobYatblvVCGkMAO2aWrdSCp7q+qIEGnGDCY=";
|
||||
};
|
||||
|
||||
@@ -78,10 +77,6 @@ stdenv.mkDerivation rec {
|
||||
# Fixes for cross compilation
|
||||
# https://github.com/NixOS/nixpkgs/issues/308283
|
||||
|
||||
# related to the compile-sane-desc-for-build
|
||||
substituteInPlace tools/Makefile.in \
|
||||
--replace 'cc -I' '$(CC_FOR_BUILD) -I'
|
||||
|
||||
# sane-desc will be used in postInstall so compile it for build
|
||||
# https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch
|
||||
patch -p1 -i ${./sane-desc-cross.patch}
|
||||
@@ -123,7 +118,7 @@ stdenv.mkDerivation rec {
|
||||
net-snmp
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
systemd
|
||||
systemdLibs
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -131,8 +126,8 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-lockdir=/var/lock/sane"
|
||||
]
|
||||
++ lib.optional (avahi != null) "--with-avahi"
|
||||
++ lib.optional (libusb1 != null) "--with-usb";
|
||||
++ lib.optionals (avahi != null) [ "--with-avahi" ]
|
||||
++ lib.optionals (libusb1 != null) [ "--with-usb" ];
|
||||
|
||||
# autoconf check for HAVE_MMAP is never set on cross compilation.
|
||||
# The pieusb backend fails compilation if HAVE_MMAP is not set.
|
||||
@@ -142,7 +137,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall =
|
||||
let
|
||||
|
||||
compatFirmware =
|
||||
extraFirmware
|
||||
++ lib.optional (gt68xxFirmware != null) {
|
||||
@@ -160,18 +154,11 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/share/sane/${f.backend}
|
||||
ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name}
|
||||
'';
|
||||
|
||||
in
|
||||
''
|
||||
mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
|
||||
# the created 49-libsane references /bin/sh
|
||||
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
|
||||
--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"
|
||||
|
||||
substituteInPlace $out/lib/libsane.la \
|
||||
--replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg"
|
||||
|
||||
# net.conf conflicts with the file generated by the nixos module
|
||||
rm $out/etc/sane.d/net.conf
|
||||
@@ -208,4 +195,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = [ lib.maintainers.symphorien ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
opencascade-occt_7_6_1,
|
||||
openvdb,
|
||||
qhull,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
wxGTK32,
|
||||
xorg,
|
||||
libbgcode,
|
||||
@@ -54,7 +54,7 @@ let
|
||||
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
|
||||
};
|
||||
});
|
||||
openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021; };
|
||||
openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };
|
||||
wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;
|
||||
opencascade-override' =
|
||||
if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
|
||||
@@ -122,9 +122,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nanosvg-fltk
|
||||
nlopt
|
||||
opencascade-override'
|
||||
openvdb_tbb_2021_8
|
||||
openvdb_tbb_2022
|
||||
qhull
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
wxGTK-override'
|
||||
xorg.libX11
|
||||
libbgcode
|
||||
|
||||
@@ -372,11 +372,11 @@
|
||||
"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
|
||||
},
|
||||
"digitalocean": {
|
||||
"hash": "sha256-mFwmq/uYQ9i6s7vWfDExl7AC5i/lA4596VH3iCdjC3Q=",
|
||||
"hash": "sha256-Twj59NRaUwx1YsgzAQm7XYbOZaJlJ/pDLzP/jam4D/8=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.66.0",
|
||||
"rev": "v2.67.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -949,13 +949,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-+3IYynRuV+iYI8FMpQmLUstNgEf3oAnPah4LmX6UjZw=",
|
||||
"hash": "sha256-ANGoCEHLuxTLpP9k2H/zUQjSEu7qob9Dh6c2Uzgj35Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v5.3.0",
|
||||
"rev": "v6.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-CdXsClQLswfo/xVr5V65vpmvQg26TZv539zK9uodOco="
|
||||
"vendorHash": "sha256-C+EP9ROYOnxkr895ZLZPgdRYm7Da2chDslsQRSq7NkU="
|
||||
},
|
||||
"oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
@@ -1138,11 +1138,11 @@
|
||||
"vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU="
|
||||
},
|
||||
"rootly": {
|
||||
"hash": "sha256-8ktCllrqpv0woEPfMkaZ0Ns+1JU9KRGANSgTfqsavgU=",
|
||||
"hash": "sha256-EPEzAftXvnusDQc9JBUHCmtuAsNFarl9yQl/fGekQ3w=",
|
||||
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
|
||||
"owner": "rootlyhq",
|
||||
"repo": "terraform-provider-rootly",
|
||||
"rev": "v3.6.1",
|
||||
"rev": "v3.6.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA="
|
||||
},
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
pluginName = "hypr-dynamic-cursors";
|
||||
version = "0-unstable-2025-07-19";
|
||||
version = "0-unstable-2025-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirtCode";
|
||||
repo = "hypr-dynamic-cursors";
|
||||
rev = "d6eb0b798c9b07f7f866647c8eb1d75a930501be";
|
||||
hash = "sha256-Yd5oSg1gS/mwobd5YFrLC3I4bar/cSGNGuIvxF3UeHE=";
|
||||
rev = "0e11ed12dbd4d0c62b362dda2559c2e374814d56";
|
||||
hash = "sha256-2JQ/KxMEVDjauaFU62T0udjKXKSiCyKO5frjVf4b4A8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -77,6 +77,11 @@ rustPlatform.buildRustPackage rec {
|
||||
"-Wl,--pop-state"
|
||||
];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--exclude alvr_xtask"
|
||||
"--workspace"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
rust-cbindgen
|
||||
pkg-config
|
||||
|
||||
@@ -9,21 +9,21 @@
|
||||
gnused,
|
||||
installShellFiles,
|
||||
iproute2,
|
||||
makeWrapper,
|
||||
makeBinaryWrapper,
|
||||
nix-update-script,
|
||||
systemd,
|
||||
udevCheckHook,
|
||||
util-linux,
|
||||
util-linuxMinimal,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amazon-ec2-net-utils";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amazonlinux";
|
||||
repo = "amazon-ec2-net-utils";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PtnRgNmVrIGndLjYjXWWx85z4oxjn637iZqXd6OSiQg=";
|
||||
};
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
makeBinaryWrapper
|
||||
udevCheckHook
|
||||
];
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mkdir -p $out
|
||||
|
||||
for file in bin/*.sh; do
|
||||
install -D -m 755 "$file" $out/bin/$(basename --suffix ".sh" "$file")
|
||||
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
gnused
|
||||
iproute2
|
||||
systemd
|
||||
util-linux
|
||||
util-linuxMinimal
|
||||
]
|
||||
}
|
||||
|
||||
@@ -121,4 +121,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ sielicki ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,11 +17,11 @@ let
|
||||
rec {
|
||||
x86_64-linux = {
|
||||
urlSuffix = "linux-x86_64.tar.gz";
|
||||
hash = "sha256-ROtQQqTr6v7JnzNOBYVoE4feUZQuqooaA6TKu9iJe8E=";
|
||||
hash = "sha256-n1ID/fGkRisxJ2rYmNLO9YX1ylezEQldEtnRuIVXHGk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
urlSuffix = "macos-universal.zip";
|
||||
hash = "sha256-y7YxsLr01qqrtftdLnx0bIXd8eL+Y3UryjgdBmaZ4gQ=";
|
||||
hash = "sha256-+TXllfXtu+7X36XJQMydJzMaWeUkp4/TRD0a35GHuws=";
|
||||
};
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
}
|
||||
@@ -30,7 +30,7 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "appflowy";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.11.43";
|
||||
version = "0.11.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
hash = "sha256-zHKLk9dLZZiH7pH5FR6+uHP9ZteMsAFyrf4V7I+vgSs=";
|
||||
hash = "sha256-hQLp0LA/VuwYzd+yPeH09WRXBWmxuW4gba85BwmCATU=";
|
||||
};
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
Generated
+527
@@ -0,0 +1,527 @@
|
||||
[
|
||||
{
|
||||
"pname": "AsmResolver",
|
||||
"version": "6.0.0-beta.3",
|
||||
"hash": "sha256-hZfhHUMesxRo7Ek0kwKBOQ7+2+WkkFhavEk4stK4Ku0="
|
||||
},
|
||||
{
|
||||
"pname": "AsmResolver.DotNet",
|
||||
"version": "6.0.0-beta.3",
|
||||
"hash": "sha256-x9BE2dfeACzOUtwrrzFJARMbt6yYREtSQYmdeqJIdJo="
|
||||
},
|
||||
{
|
||||
"pname": "AsmResolver.PE",
|
||||
"version": "6.0.0-beta.3",
|
||||
"hash": "sha256-//cJkU4+PCAlBcSDeLjwWVkPJBQT1XzHx65uzrEPJR8="
|
||||
},
|
||||
{
|
||||
"pname": "AsmResolver.PE.File",
|
||||
"version": "6.0.0-beta.3",
|
||||
"hash": "sha256-YzOcIBeILNSn8XATTC9j+0vgFXi6j4t/CQngOK/ZrnA="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Checksum",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-/RUgkXYya3tpl7NAEbfMoTpw8UJQodSEs0j3l4iO5t4="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.CIL",
|
||||
"version": "1.1.6",
|
||||
"hash": "sha256-dDiXWd3AtOWlaxFC1+xdw1MkmIGat2/CuH1oTZBF/RA="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Conversions.FastPng",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-tcMBR4jo61eqEQSiZSFjtsfIku9KOTEgkZnVXD5WX7s="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Gee.External.Capstone",
|
||||
"version": "2.3.2",
|
||||
"hash": "sha256-IrcwjWUR0hAO2dmDVIFCd82pJYnpnrRrUMd8Z0dcVjk="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.GUI.Web.Dependencies",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-vRaU7qR5u2TKk1RdP4ZyTbe+/rJ02ffeC8YkqMp+W4E="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.HashAlgorithms",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-z2ryExCXJymw2UsdZxKseYPWQWg5aJe9surz5QABof4="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.ICSharpCode.Decompiler",
|
||||
"version": "9.1.0.8017",
|
||||
"hash": "sha256-2OC9esZJ2hbeEcWJte0aAYdvykxwzGVF2IB1hV0BcMg="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.IO.Endian",
|
||||
"version": "2.0.2",
|
||||
"hash": "sha256-/oxfkQpCaERReRha+2fkPQaW9JNAyJdiujp1326Pcmw="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Mining.PredefinedAssets",
|
||||
"version": "1.5.0",
|
||||
"hash": "sha256-c1Ru75IKNz/TTYrgMvA0JBW25fNmDsWDxx0bWwrOKco="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.NativeDialogs",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-RwrdAQpmZZII5jugbfCDd/sNqy3ozJ6dqWunuHApkuo="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Primitives",
|
||||
"version": "3.1.3",
|
||||
"hash": "sha256-17RT4wzgcZwzWjS92fX9lsZk91BKxEM8/kHc5aG/WU0="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Primitives",
|
||||
"version": "3.1.6",
|
||||
"hash": "sha256-0RJAOo3bP8o5pxLvJd7TVTLZqkHg+/PqvN0IF2EyRPY="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Primitives",
|
||||
"version": "3.2.0",
|
||||
"hash": "sha256-CoWcgLFJ9hIH09vDfTvrtN6dz9CzBOrXkC2kwj+ebGc="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.SharpGLTF.Core",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-WZgPF8/KMTIML3dYeePGGSap3j2RxWTegteKUrrOmas="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.SharpGLTF.Runtime",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-i3EdcJig488wNOlS2my+iGQMuc2+gm/EYmTZ1Ju7iR4="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.SharpGLTF.Toolkit",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-5cn9qRZNl+lAjG2NTZ0KoMnsuCUhlI8bctqzB3vT4UE="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.SourceGenerated",
|
||||
"version": "1.2.5",
|
||||
"hash": "sha256-sYOnCL+63F8LVLONtxC9Wcu5erFqkms95FM2QwphEck="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Text.Html",
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-SW5BW3FT8Rt0zR6JNtKLfzjc5kl2fJpBs2PuWP3gBWY="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Text.SourceGeneration",
|
||||
"version": "1.2.2",
|
||||
"hash": "sha256-CsJuv8agq57DsjChX5CC9gyhnr0hwNpCdeCxxu62w48="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.TextureDecoder",
|
||||
"version": "2.3.0",
|
||||
"hash": "sha256-P+McipTHztjmibwO4kOsqGs5u6o+15k52r35tq80oNQ="
|
||||
},
|
||||
{
|
||||
"pname": "AssetRipper.Tpk",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-1FJI8HbeJsXc77+uQngG3LJJQt7LshTKoYwtnQ+gyoc="
|
||||
},
|
||||
{
|
||||
"pname": "AtkSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-ubAzPecV3tV9h2OUUqiJw8OqPzg+iHQ1LBMZ7sU/mJo="
|
||||
},
|
||||
{
|
||||
"pname": "CairoSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-3dTmn3TpcDxEqTsvPdA8ueMYzK0IR5Z/vUR6xPCEnYE="
|
||||
},
|
||||
{
|
||||
"pname": "Disarm",
|
||||
"version": "2022.1.0-master.57",
|
||||
"hash": "sha256-KtLpcS+n+HVkHc/CKBoyx+PWKpxkkVvtsqf002KSbPI=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/disarm/2022.1.0-master.57/disarm.2022.1.0-master.57.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "DXDecompiler-ly",
|
||||
"version": "0.0.1",
|
||||
"hash": "sha256-R8Nyy60qOPru3SH5mPGNL1/tUKwqbxNq2QqbveoYznc="
|
||||
},
|
||||
{
|
||||
"pname": "Fmod5Sharp",
|
||||
"version": "3.0.1",
|
||||
"hash": "sha256-Od9D7s20ONwuD1V6ZUCKkCyLR57pX8GRDuDs5oZzc+I="
|
||||
},
|
||||
{
|
||||
"pname": "GdkSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-6pW0Pj5jJXiyQfqPKIu0klrViMqKf+pRk++a4chIaxA="
|
||||
},
|
||||
{
|
||||
"pname": "GioSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-CLW912aVbiFjcWS8g36fEx+4HfOB7nAlhK1sVaPZSCM="
|
||||
},
|
||||
{
|
||||
"pname": "GLibSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-aJC9OOXB6qV/vjCarQn4DC/jxAuyV2cTclFjB3oguMk="
|
||||
},
|
||||
{
|
||||
"pname": "GtkSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-CgNVKW81n8MdVy481nYVY6KApDzlhEzxILSKkNLe5pg="
|
||||
},
|
||||
{
|
||||
"pname": "Iced",
|
||||
"version": "1.21.0",
|
||||
"hash": "sha256-0xYTYX4935Ejm7yUqMWHhJtCNuj4oqK6Weojl6FIfHo="
|
||||
},
|
||||
{
|
||||
"pname": "IndexRange",
|
||||
"version": "1.0.2",
|
||||
"hash": "sha256-bsoOY0HLG+nsjdeA3XiTOq0NSvXIz/xasFdSMe6svWQ="
|
||||
},
|
||||
{
|
||||
"pname": "K4os.Compression.LZ4",
|
||||
"version": "1.3.8",
|
||||
"hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA="
|
||||
},
|
||||
{
|
||||
"pname": "Kyaru.Texture2DDecoder",
|
||||
"version": "0.17.0",
|
||||
"hash": "sha256-8eHFAZ8Y00C9g4ZmUTxYrgqIr4gxMwTM7vtxER8w29g="
|
||||
},
|
||||
{
|
||||
"pname": "Kyaru.Texture2DDecoder.Linux",
|
||||
"version": "0.1.0",
|
||||
"hash": "sha256-Wrk4NnAGx3E/3zRn03822Zzfcuyx7U4+54NbAe7Mc58="
|
||||
},
|
||||
{
|
||||
"pname": "Kyaru.Texture2DDecoder.macOS",
|
||||
"version": "0.1.0",
|
||||
"hash": "sha256-BjioRXZSKONx5A1v7HAQtYzhVpMHCzfsi6XvyxLdO0s="
|
||||
},
|
||||
{
|
||||
"pname": "Kyaru.Texture2DDecoder.Windows",
|
||||
"version": "0.1.0",
|
||||
"hash": "sha256-I4Huq7yZFFVX+9lAebuKf88LVj+oKQB5AetnwalEhlA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.OpenApi",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-Kk1WNf1BS+9LjjXjBrYb1YCr+23W9PJ+B9Kv2OBv2Oc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-+7YVB4UIGrvWzDkW5boLTC+6l2s96Jh1p0NeT95bb9Y="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-zmTSI77qeBKTmb0m79mbVaW3/94t7AWPO1A2Tchowng="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "4.14.0",
|
||||
"hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ApiDescription.Server",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-GceEAtCVtm8xUHjR6obQ6bBJMOf+9d9OQ1iVr48sQbg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "1.6.17",
|
||||
"hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "1.6.23",
|
||||
"hash": "sha256-YD2oxM/tlNpK5xUeHF85xdqcpBzHioUSyRjpN2A7KcY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "1.6.24",
|
||||
"hash": "sha256-26sypyWk/38Xz6nlFQ1eYQeLM/k4kGyNiLazgyPyuJQ="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Core",
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-rD5ubdSgpufNjNyCerO0N5Gg2brUMhjEOL5qaNwFhBM="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Core",
|
||||
"version": "2.1.0",
|
||||
"hash": "sha256-cVfdq9B7wwojGiTOOrcnweQyI9q7U9+uDirqjisWrd8="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Core",
|
||||
"version": "2.2.1",
|
||||
"hash": "sha256-eUZF2/0w5IgGY9UtnZIk1VwwH6VCKP9iPJXVcseIc0c="
|
||||
},
|
||||
{
|
||||
"pname": "NAudio.Vorbis",
|
||||
"version": "1.5.0",
|
||||
"hash": "sha256-FX5EHVRLcWfjY+/NhkUf33fMFrTcPG3Ztm5ptmu1caw="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
"version": "2.0.3",
|
||||
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
|
||||
},
|
||||
{
|
||||
"pname": "NVorbis",
|
||||
"version": "0.10.4",
|
||||
"hash": "sha256-6ZouAJWaNge6DFnLHDr35uf4vs6Kf12RPp4ahuEejlA="
|
||||
},
|
||||
{
|
||||
"pname": "OggVorbisEncoder",
|
||||
"version": "1.2.0",
|
||||
"hash": "sha256-5UhHf3JJUTG968Bst/cLR30qMTe1AntntDIv8w1IkFY="
|
||||
},
|
||||
{
|
||||
"pname": "Ookii.CommandLine",
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-9iSS/YaB+rwChSn0PLUZXiBWDqJ4GyjnETwmemNG8b8="
|
||||
},
|
||||
{
|
||||
"pname": "Ookii.Common",
|
||||
"version": "1.0.0",
|
||||
"hash": "sha256-u8J6JSAOp2gJBsmu9ZjiSgipoXOVpseqtYf38tlnN3g="
|
||||
},
|
||||
{
|
||||
"pname": "oqo0.SwaggerThemes",
|
||||
"version": "1.4.3",
|
||||
"hash": "sha256-KiOTY0s0J4K9hbQ7pSvgNeb9j6h0lbI9sHQxlNSMIqY="
|
||||
},
|
||||
{
|
||||
"pname": "PangoSharp",
|
||||
"version": "3.24.24.117-develop",
|
||||
"hash": "sha256-G+UgcJKurjnR3kGfHB6SFZ7ujz1+5/+yN8jUYQ7jpgM="
|
||||
},
|
||||
{
|
||||
"pname": "PolySharp",
|
||||
"version": "1.15.0",
|
||||
"hash": "sha256-nH/UOZW4X93FUELaDteMvEEWofX4vii4e59jOqx9JTg="
|
||||
},
|
||||
{
|
||||
"pname": "Samboy063.Cpp2IL.Core",
|
||||
"version": "2022.1.0-development.1356",
|
||||
"hash": "sha256-fGf4BItKAA5wxqnHeipLAc9Tezsb6m0dtGcnXMcnYdM=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/samboy063.cpp2il.core/2022.1.0-development.1356/samboy063.cpp2il.core.2022.1.0-development.1356.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Samboy063.LibCpp2IL",
|
||||
"version": "2022.1.0-development.1356",
|
||||
"hash": "sha256-F8SN2ooYcE+rAya645I166xqZeC5XsqGo8OiYnAkBH8=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/samboy063.libcpp2il/2022.1.0-development.1356/samboy063.libcpp2il.2022.1.0-development.1356.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Samboy063.WasmDisassembler",
|
||||
"version": "2022.1.0-development.1356",
|
||||
"hash": "sha256-w2fMnjPYikPEveS9lPwiTHlOazN2w3IlP5EnLyp+Ln0=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/samboy063.wasmdisassembler/2022.1.0-development.1356/samboy063.wasmdisassembler.2022.1.0-development.1356.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
"version": "0.38.0",
|
||||
"hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="
|
||||
},
|
||||
{
|
||||
"pname": "SharpCompress",
|
||||
"version": "0.40.0",
|
||||
"hash": "sha256-pxz5ef//xOUClwuyflO0eLAfUItFcwfq74Cf0Hj5c1E="
|
||||
},
|
||||
{
|
||||
"pname": "SharpZipLib",
|
||||
"version": "1.4.2",
|
||||
"hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
|
||||
},
|
||||
{
|
||||
"pname": "SourceGenerator.Foundations",
|
||||
"version": "2.0.13",
|
||||
"hash": "sha256-duI1IaumXBKE7xY/YoNqJWXLF96OznZT5IF79ox1s64="
|
||||
},
|
||||
{
|
||||
"pname": "StableNameDotNet",
|
||||
"version": "0.1.0-development.1356",
|
||||
"hash": "sha256-BsH+CwpStediIOeM+b79PZzZWJQnqKi5ofgTHorcXUU=",
|
||||
"url": "https://nuget.samboy.dev/v3/package/stablenamedotnet/0.1.0-development.1356/stablenamedotnet.0.1.0-development.1356.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "StbImageWriteSharp",
|
||||
"version": "1.16.7",
|
||||
"hash": "sha256-E9AQO6tcXneDo4rwcSaW/cNhqFDv881o74wqB2fTG0Y="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore",
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-rJFeYQgpQ6O3nK0I0ovzh5k8NA/Hzp6kIxKRBryBBBw="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.Swagger",
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-MgjUvPjRdrSVALtJL+kQZsL0siNVPUhVKzsc6VMKsLM="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.SwaggerGen",
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-yRYM43099u0sH9uozOWAHSj0uLBOSEAp1zzR4RJCYEU="
|
||||
},
|
||||
{
|
||||
"pname": "Swashbuckle.AspNetCore.SwaggerUI",
|
||||
"version": "9.0.1",
|
||||
"hash": "sha256-R1c/a5mMqstqSwm/PIj6FYa0fimE7ry4KibY6PUAuZQ="
|
||||
},
|
||||
{
|
||||
"pname": "System.Buffers",
|
||||
"version": "4.5.1",
|
||||
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Buffers",
|
||||
"version": "4.6.0",
|
||||
"hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-bOZgOtovt6tNf1IVV8ndHVvdqpMDlHN6Zwfl0KnsE0M="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.3",
|
||||
"hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.5",
|
||||
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Tensors",
|
||||
"version": "10.0.0-preview.5.25277.114",
|
||||
"hash": "sha256-zXbNpujiQO8JcKNvJTMdOtokqvBpD6LeWpeurJDFmts="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.4.0",
|
||||
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "4.5.3",
|
||||
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.1.1",
|
||||
"hash": "sha256-FeUStJ8EDvosTT651WiWE0X19rE9QqNQpLmhkb/n+rM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding.CodePages",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-HHifM7LW0+JhFLHMbPx3954t70IjdTPoBE8mWEiJxcI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "6.0.5",
|
||||
"hash": "sha256-NKWNrCcKy8S5ldsJzm6+udU53fWzmPGZZG/gpk0Kz4k="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "9.0.4",
|
||||
"hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "9.0.6",
|
||||
"hash": "sha256-WC/QbZhTaoZ3PbDKcFvJwMIA4xLUdnMrAXGlOW87VNY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
"version": "4.5.4",
|
||||
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
|
||||
},
|
||||
{
|
||||
"pname": "System.ValueTuple",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
|
||||
},
|
||||
{
|
||||
"pname": "TerraFX.Interop.Windows",
|
||||
"version": "10.0.26100.2",
|
||||
"hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
"version": "0.8.1",
|
||||
"hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="
|
||||
},
|
||||
{
|
||||
"pname": "ZstdSharp.Port",
|
||||
"version": "0.8.5",
|
||||
"hash": "sha256-+UQFeU64md0LlSf9nMXif6hHnfYEKm+WRyYd0Vo2QvI="
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,87 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoPatchelfHook,
|
||||
buildDotnetModule,
|
||||
fetchFromGitHub,
|
||||
dbus,
|
||||
dotnetCorePackages,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "assetripper";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AssetRipper";
|
||||
repo = "AssetRipper";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ixXWbygFhvOjld+YRLIhkO3cgDNkQsbivri2pjU4rgM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed 's@Path.Join(ExecutingDirectory, "temp",@Path.Join(Path.GetTempPath(), "AssetRipper",@' \
|
||||
-i Source/AssetRipper.IO.Files/Utils/TemporaryFileStorage.cs
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
# Prevent automatic patching of all files. This is necessary as applying
|
||||
# autoPatchelf indiscriminately causes dangling references to openssl and
|
||||
# icu4c in AssetRipper.GUI.Free
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
# Avoid IOException on startup
|
||||
makeWrapperArgs = [
|
||||
"--add-flags"
|
||||
"--log=false"
|
||||
];
|
||||
|
||||
# Make the main executable available under a more intuitive name.
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
ln -rs $out/bin/AssetRipper.GUI.Free $out/bin/AssetRipper
|
||||
'';
|
||||
|
||||
# Patch some prebuilt libraries fetched via NuGet.
|
||||
fixupPhase = ''
|
||||
runHook preFixup
|
||||
|
||||
autoPatchelf $out/lib/${finalAttrs.pname}/libnfd.so
|
||||
autoPatchelf $out/lib/${finalAttrs.pname}/libTexture2DDecoderNative.so
|
||||
|
||||
runHook postFixup
|
||||
'';
|
||||
|
||||
projectFile = "Source/AssetRipper.GUI.Free/AssetRipper.GUI.Free.csproj";
|
||||
|
||||
# Error: "PublishTrimmed is implied by native compilation and cannot be disabled."
|
||||
# We need to override the project settings and disable native AoT compilation
|
||||
# as this is incompatible with PublishTrimmed.
|
||||
dotnetInstallFlags = [ "-p:PublishAot=false" ];
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
executables = [ "AssetRipper.GUI.Free" ];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_9_0;
|
||||
dotnet-runtime = finalAttrs.dotnet-sdk.aspnetcore;
|
||||
|
||||
meta = {
|
||||
description = "Tool for extracting assets from Unity serialized files and asset bundles";
|
||||
homepage = "https://github.com/AssetRipper/AssetRipper";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "AssetRipper";
|
||||
maintainers = with lib.maintainers; [ YoshiRulz ];
|
||||
platforms = lib.platforms.unix;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # libraries fetched by NuGet
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "auth0-cli";
|
||||
version = "1.18.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8U5jIzXh0bDKv72nPCsHa20Kzik3Gd/MUjTg6meHLiI=";
|
||||
hash = "sha256-j8NAm7HodnQBLSCenIzxsr6iYnS3H4c95vzUmpCADxg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Js5yB9a54+98/yPWCvHaxniGwmHXl4hHKxDXGG6IxGQ=";
|
||||
vendorHash = "sha256-3shr7IaiNKP3TZCETb1oYYINzeN+uENS0JLr3SOYWhs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
boost,
|
||||
fuse3,
|
||||
lib45d,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
liburing,
|
||||
installShellFiles,
|
||||
}:
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
fuse3
|
||||
lib45d
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
liburing
|
||||
];
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
opencv,
|
||||
pcre,
|
||||
systemd,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
webkitgtk_4_1,
|
||||
wxGTK31,
|
||||
xorg,
|
||||
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencascade-occt_7_6
|
||||
openvdb
|
||||
pcre
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
webkitgtk_4_1
|
||||
wxGTK'
|
||||
xorg.libX11
|
||||
|
||||
@@ -29,11 +29,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bind";
|
||||
version = "9.20.12";
|
||||
version = "9.20.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-3TLW62dQTopDCq9wtO+JTz0CJrRMfgI3DJsNN38ceZk=";
|
||||
hash = "sha256-FR+TdurTF+ZGpdDJ8BwGA4bYkRGNdDen+Cm7lyfHs0w=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -33,6 +33,6 @@ buildGoModule (finalAttrs: {
|
||||
mainProgram = "bingo";
|
||||
homepage = "https://github.com/bwplotka/bingo";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -118,12 +118,12 @@ in
|
||||
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.5.2";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-6blXwp3DeWNM5Q6M5gWj4O+K/gFxEOj41lzlc5biEYQ=";
|
||||
hash = "sha256-DNVZUZpysCyB/Xt8yB352gO+UK8Cd4aDFGYuUDKyIrs=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -257,7 +257,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
libsndfile
|
||||
libtiff
|
||||
libwebp
|
||||
(manifold.override { tbb_2021 = tbb; })
|
||||
manifold
|
||||
opencolorio
|
||||
openexr
|
||||
openimageio
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "c2patool";
|
||||
version = "0.20.3";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contentauth";
|
||||
repo = "c2pa-rs";
|
||||
tag = "c2patool-v${finalAttrs.version}";
|
||||
hash = "sha256-ubJyplfvQ8OOdPwhnphZl51nbAgFcZz9fMTyQCPu5cw=";
|
||||
hash = "sha256-6u9L3cEFB2UIsrH8VyGxHzhZqCAjEAIBLZknmYJl/JM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xp9CfHtC4g2o5QJSU/IcNVi8CXifdB9npOYbFujLht4=";
|
||||
cargoHash = "sha256-wjGixVxuRHeByFiTS/WsBCTyxgLUnxq7P6qASxCU4tY=";
|
||||
|
||||
# use the non-vendored openssl
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@@ -19,13 +19,13 @@ in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pname = "c3c${optionalString debug "-debug"}";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c3lang";
|
||||
repo = "c3c";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LIwav9ZvNRn4tGh+MGEhimSIKROU3H+R1pc3oyGDb18=";
|
||||
hash = "sha256-o95Y5CYPITjn8KjxIZlBtwc6FfvZo2m5atR1Fyh9w+c=";
|
||||
};
|
||||
|
||||
cmakeBuildType = if debug then "Debug" else "Release";
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
libgit2,
|
||||
curl,
|
||||
fmt,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libgit2
|
||||
fmt
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
nlohmann_json
|
||||
curl
|
||||
];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q8zDggvzEyK/kAgDCW98UX1VLR0+jAvHn+hSyQa99dk=";
|
||||
hash = "sha256-UcDcTWtus2QjUK2HpTQd0dRMM/qxSXhPeWrbnXB40+A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HreVuk49FZm90XxUpkfInoSQvILOHirejf/dbx42iTI=";
|
||||
cargoHash = "sha256-VxKYilelkxEv1tsBSbINs0fk1fTzf3FWQ085cKwsxrw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'cddlc'
|
||||
@@ -0,0 +1,19 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
cddlc (0.4.2)
|
||||
neatjson (~> 0.10)
|
||||
treetop (~> 1)
|
||||
neatjson (0.10.5)
|
||||
polyglot (0.3.5)
|
||||
treetop (1.6.14)
|
||||
polyglot (~> 0.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cddlc
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.9
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
cddlc = {
|
||||
dependencies = [
|
||||
"neatjson"
|
||||
"treetop"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1s3fbgd5yqgji162zsmlwnva1v1r3zc1qiyv6im7karv5f08r8m3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.2";
|
||||
};
|
||||
neatjson = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.5";
|
||||
};
|
||||
polyglot = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.5";
|
||||
};
|
||||
treetop = {
|
||||
dependencies = [ "polyglot" ];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.14";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
bundlerApp,
|
||||
bundlerUpdateScript,
|
||||
}:
|
||||
|
||||
bundlerApp {
|
||||
pname = "cddlc";
|
||||
|
||||
gemdir = ./.;
|
||||
|
||||
exes = [ "cddlc" ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "cddlc";
|
||||
|
||||
meta = {
|
||||
description = "CDDL conversion utilities";
|
||||
homepage = "https://github.com/cabo/cddlc";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ amesgen ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "cddlc";
|
||||
};
|
||||
}
|
||||
@@ -12,18 +12,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.31.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-BGrSArFU/wl47Xad7dzOCL8aNgvISwF5gXUNTpKDBMY=";
|
||||
hash = "sha256-C1PXK/5vPFV5cz1dYWV+GaYl0grscb6qCR66BSih5/E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-54eCWW+XJIiMbChvJ06o7SlFq7ZZVgovw2lUXUJem18=";
|
||||
cargoHash = "sha256-OMGGgg6hYdZ40vcUxVsWyLentFBj62CYEH3NJ909kYM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.25.9";
|
||||
version = "1.25.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SiSNYtcqKbbVCArSFhNsu6gckQlKbTsDvECbCn0jXCU=";
|
||||
hash = "sha256-fzvhnakjFyfQQEcf73rGhOoUv28FzPOoYEcApV34MPc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QvdFW/o481F85WuXNdz99Q9MBiGRjVSWvPRytq67vYU=";
|
||||
|
||||
@@ -48,6 +48,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
teams = [ teams.c3d2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,6 +46,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Tools for decoding digital ham communication";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
teams = [ lib.teams.c3d2 ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnf5";
|
||||
version = "5.2.16.0";
|
||||
version = "5.2.17.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "rpm-software-management";
|
||||
repo = "dnf5";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-k71UKcKF5IdK96Q3TnAwFGoTRYmTlSO2kkPD54Bd9s8=";
|
||||
hash = "sha256-bVXmpoM2ymLgqjv8+3syYhkIKSyW68eKzKhUWRfR1vY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
sqlite,
|
||||
pkg-config,
|
||||
dovecot,
|
||||
xapian,
|
||||
icu,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dovecot-fts-xapian";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grosjo";
|
||||
repo = "fts-xapian";
|
||||
rev = version;
|
||||
hash = "sha256-jHXeCJVdRWGdLMooh5cq5ZeZPM5fDo1lO6U5VMcwf3g=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
xapian
|
||||
icu
|
||||
sqlite
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export PANDOC=false
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-dovecot=${dovecot}/lib/dovecot"
|
||||
"--with-moduledir=${placeholder "out"}/lib/dovecot/modules"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/grosjo/fts-xapian";
|
||||
description = "Dovecot FTS plugin based on Xapian";
|
||||
changelog = "https://github.com/grosjo/fts-xapian/releases";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [
|
||||
julm
|
||||
symphorien
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/dovecot_fts_xapian.x86_64-darwin
|
||||
};
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "4.0.0-unstable-2025-08-31";
|
||||
version = "4.0.0-unstable-2025-09-09";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "1e6067a6b9246c0bddd4655d962f90e110f842f6";
|
||||
hash = "sha256-UWon2riHFD1szSQglwUBePuiTsk0znj01MZmJwvPGGM=";
|
||||
rev = "6e7f9679d5f0509f4d6a847729c5eb36f9b3467e";
|
||||
hash = "sha256-leYLtwHTFIqcRaYOA/8J6+xwqnjF7hv85VV/hJc5pe8=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
||||
@@ -21,7 +21,6 @@ buildGoModule {
|
||||
description = "Experimental Drone runner that executes a pipeline on a remote machine";
|
||||
homepage = "https://github.com/drone-runners/drone-runner-ssh";
|
||||
license = licenses.unfreeRedistributable;
|
||||
teams = [ teams.c3d2 ];
|
||||
mainProgram = "drone-runner-ssh";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -436,6 +436,42 @@ let
|
||||
description = "iscan GT-1500 for " + passthru.hw;
|
||||
};
|
||||
};
|
||||
ds30 = stdenv.mkDerivation rec {
|
||||
name = "iscan-ds-30-bundle";
|
||||
version = "2.30.4";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
"https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
|
||||
];
|
||||
sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
rpm
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
|
||||
mkdir $out
|
||||
cp -r usr/share $out
|
||||
cp -r usr/lib64 $out/lib
|
||||
mv $out/lib/iscan $out/lib/esci
|
||||
mkdir $out/share/esci
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
registrationCommand = ''
|
||||
$registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so"
|
||||
'';
|
||||
hw = "DS-30";
|
||||
};
|
||||
meta = common_meta // {
|
||||
description = "Plugin to support " + passthru.hw + " scanner in sane";
|
||||
};
|
||||
};
|
||||
network = stdenv.mkDerivation rec {
|
||||
pname = "iscan-nt-bundle";
|
||||
# for the version, look for the driver of XP-750 in the search page
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "eza";
|
||||
version = "0.23.2";
|
||||
version = "0.23.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7YQj2QYWn4GHSYBX8MlqPjdFZMpP1ZdzEHInMJaesKc=";
|
||||
hash = "sha256-z9lG2Ht8Kn/QxmxWqMV27iYGHdUwaz87ayLAZdKJPvQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QS6iQP5PBHKcQEsr97FawUCkMCswAYg7Ua2ZeIvL7CM=";
|
||||
cargoHash = "sha256-Izogi+IWOwAuaOBs+99UzuzwIzzfCM8pqo3xZuutYI8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.15.88";
|
||||
version = "2.15.96";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qSQIXDc7x3/qDxEeTEsPA2Dwl29OW+SggkPvbe8rojI=";
|
||||
hash = "sha256-HGdOlLJBnobstH0oCOMY5qSPjI+xUevTsRLQK4ubSEE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HOnnfWET7p8hdhuoQyx3m7UV+Pp552CrQNxgtq0rA+w=";
|
||||
vendorHash = "sha256-6J9Iw8Z5iRU+Kx7rfyG1cALEmiynPxVfnxYC9/SFpPI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "freetube";
|
||||
version = "0.23.8";
|
||||
version = "0.23.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeTubeApp";
|
||||
repo = "FreeTube";
|
||||
tag = "v${finalAttrs.version}-beta";
|
||||
hash = "sha256-CHp/6/E/v6UdSe3xoB66Ot24WuZDPdmNyUG1w2w3bX0=";
|
||||
hash = "sha256-KTVGmYlDOqugTbC4YQcoTUW+Ja9y1H6mwULrMkZVI0Y=";
|
||||
};
|
||||
|
||||
# Darwin requires writable Electron dist
|
||||
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-ia5wLRt3Hmo4/dsB1/rhGWGJ7LMnVR9ju9lSlQZDTTg=";
|
||||
hash = "sha256-CnOxWA36D9x+p/Xx6sE865MSyTgPt054SX+ASr9K7zI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fzf-git-sh";
|
||||
version = "0-unstable-2025-08-31";
|
||||
version = "0-unstable-2025-09-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf-git.sh";
|
||||
rev = "2eef6bf288bf19a6402784a63336f06f87d9a584";
|
||||
hash = "sha256-r3b05erlNGw3GQq/nMPqTHRroGEFmhufpiXqaIhQGTA=";
|
||||
rev = "a6426e615fb9966b99999ae0668847c36e8f53c2";
|
||||
hash = "sha256-oMtOCdexNh37Y9kvxzKsjuKM+Dw3r7zbNm9U8O9gpxg=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
# Reliably fails to generate gedit-file-browser-enum-types.h in time
|
||||
enableParallelBuilding = false;
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/gedit/gedit";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-minimock";
|
||||
version = "3.4.6";
|
||||
version = "3.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gojuno";
|
||||
repo = "minimock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jbl8ngVagwbDSIZFrMtRRCHvQ0e6mojrk4rXJ/HsJSk=";
|
||||
hash = "sha256-Dx4m17r7GOdiaV8DzqOXAr32dNCXJyi7gID6GHohKXk=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "google-alloydb-auth-proxy";
|
||||
version = "1.13.5";
|
||||
version = "1.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "alloydb-auth-proxy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UbJOVZc9hXMXfBPIJl4C3y9fAp69cRue95EJX155kDQ=";
|
||||
hash = "sha256-d3YMyvUoNfU32pcStsriBCCiyMPHRZrJzHgrnBRmUL4=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-9tNj1W4TGepe/CqbNx4Mk26iMOxDwWeKRw36lFmDpts=";
|
||||
vendorHash = "sha256-DobqGejaRrCy8RJyydepnTVp9IdeM9X6A+3uUgH15iM=";
|
||||
|
||||
checkFlags = [
|
||||
"-short"
|
||||
|
||||
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2025-08-28";
|
||||
version = "0-unstable-2025-09-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Gruvbox-GTK-Theme";
|
||||
rev = "2034b4ce9aa30281ff8f3af49b0e53e34a029fd7";
|
||||
hash = "sha256-OM5ZkXZxDSYtLS2CbqAjXXJM95plC7VWgvUG0qYbEJI=";
|
||||
rev = "4a8a67574ef227efa9c129ce57d510c2634d53e5";
|
||||
hash = "sha256-cass0sAc6/FzNF/R8HjjGU6mFigD6hjZR/R1Nj+tk38=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
cmake,
|
||||
metee,
|
||||
udev,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igsc";
|
||||
version = "0.9.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "igsc";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-ecjcDYirbJC2s48+SOwFuJAJQ6eaabTrmgTjgb+dXrA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
metee
|
||||
udev
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMETEE_LIB_PATH=${metee}/lib"
|
||||
"-DMETEE_HEADER_PATH=${metee}/include"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
mainProgram = "igsc";
|
||||
maintainers = with lib.maintainers; [ xddxdd ];
|
||||
description = "Intel graphics system controller firmware update library";
|
||||
homepage = "https://github.com/intel/igsc";
|
||||
license = lib.licenses.asl20;
|
||||
changelog = "https://github.com/intel/igsc/releases/tag/V${finalAttrs.version}";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -2,82 +2,105 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bash,
|
||||
cmake,
|
||||
runCommandLocal,
|
||||
ninja,
|
||||
git,
|
||||
bison,
|
||||
flex,
|
||||
zlib,
|
||||
intel-compute-runtime,
|
||||
llvmPackages_15,
|
||||
opencl-clang,
|
||||
python3,
|
||||
spirv-tools,
|
||||
spirv-headers,
|
||||
spirv-llvm-translator,
|
||||
|
||||
buildWithPatches ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
vc_intrinsics_src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
rev = "v0.23.1";
|
||||
hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc=";
|
||||
};
|
||||
|
||||
inherit (llvmPackages_15) lld llvm;
|
||||
inherit (if buildWithPatches then opencl-clang else llvmPackages_15) clang libclang;
|
||||
spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
|
||||
|
||||
# Handholding the braindead build script
|
||||
# cmake requires an absolute path
|
||||
prebuilds = runCommandLocal "igc-cclang-prebuilds" { } ''
|
||||
mkdir $out
|
||||
ln -s ${clang}/bin/clang $out/
|
||||
ln -s ${opencl-clang}/lib/* $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o=";
|
||||
};
|
||||
# See the repository for expected versions:
|
||||
# <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
name = "igc";
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vtVktc77OT7OANVXnLvEQx+NEQBPrTE5FFynXhpsK7o=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
name = "llvm-project";
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
tag = "llvmorg-15.0.7";
|
||||
hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
name = "vc-intrinsics";
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
tag = "v0.23.1";
|
||||
hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
name = "opencl-clang";
|
||||
owner = "intel";
|
||||
repo = "opencl-clang";
|
||||
tag = "v15.0.3";
|
||||
hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw==";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
name = "llvm-spirv";
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-LLVM-Translator";
|
||||
tag = "v15.0.15";
|
||||
hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
cmakeDir = "../igc";
|
||||
|
||||
postUnpack = ''
|
||||
chmod -R +w .
|
||||
mv opencl-clang llvm-spirv llvm-project/llvm/projects/
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \
|
||||
substituteInPlace igc/IGC/AdaptorOCL/igc-opencl.pc.in \
|
||||
--replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
|
||||
--replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib"
|
||||
|
||||
chmod +x IGC/Scripts/igc_create_linker_script.sh
|
||||
patchShebangs --build IGC/Scripts/igc_create_linker_script.sh
|
||||
chmod +x igc/IGC/Scripts/igc_create_linker_script.sh
|
||||
patchShebangs --build igc/IGC/Scripts/igc_create_linker_script.sh
|
||||
|
||||
# The build system only applies patches when the sources are in a
|
||||
# Git repository.
|
||||
git -C llvm-project init
|
||||
git -C llvm-project -c user.name=nixbld -c user.email= commit --allow-empty -m stub
|
||||
substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \
|
||||
--replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \
|
||||
'COMMAND patch -p1 --ignore-whitespace -i '
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
bash
|
||||
bison
|
||||
cmake
|
||||
flex
|
||||
git
|
||||
ninja
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
mako
|
||||
pyyaml
|
||||
]
|
||||
))
|
||||
zlib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lld
|
||||
llvm
|
||||
spirv-headers
|
||||
spirv-llvm-translator'
|
||||
spirv-tools
|
||||
];
|
||||
|
||||
@@ -87,11 +110,10 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
|
||||
"-DCCLANG_BUILD_PREBUILDS=ON"
|
||||
"-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"
|
||||
"-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds"
|
||||
"-DIGC_OPTION__VC_INTRINSICS_MODE=Source"
|
||||
"-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS=ON"
|
||||
"-DSPIRV-Headers_INCLUDE_DIR=${spirv-headers}/include"
|
||||
"-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}"
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
@@ -102,7 +124,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
|
||||
homepage = "https://github.com/intel/intel-graphics-compiler";
|
||||
changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "jwx";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lestrrat-go";
|
||||
repo = "jwx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vOPDypgoTyI1zVxoRReJyZEh7mErAy1jPj/5uXP1hWs=";
|
||||
hash = "sha256-TGB6dMybvMH/mXlNwnj63kOrj56mbEFTQSVfphnQJfY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7lMvSwLi588UBI31YDi/VqyAqwUjWUwjOZbxE3fZQWU=";
|
||||
|
||||
@@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keycloak";
|
||||
version = "26.3.3";
|
||||
version = "26.3.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
|
||||
hash = "sha256-5+KmaLz6pZjgOI3CoXk1wC/LXiYzRiV2s2l0Jkwb45M=";
|
||||
hash = "sha256-K+7ZUBN3iYGMteP/ycu4M5rJPdIavN144BgOwktdu3g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
qt6,
|
||||
qt6Packages,
|
||||
cmake,
|
||||
alsa-lib,
|
||||
pandoc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kmidimon";
|
||||
version = "1.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pedrolcl";
|
||||
repo = "kmidimon";
|
||||
tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-cITRv/k7NJvTPJYNjDXb21ctr69ThIJppmBwrmj7O74=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
pandoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6.qtbase
|
||||
qt6.qttools
|
||||
qt6.qt5compat
|
||||
qt6Packages.drumstick
|
||||
alsa-lib
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Drumstick MIDI Monitor";
|
||||
longDescription = ''
|
||||
Drumstick MIDI Monitor logs MIDI events coming from MIDI external ports or
|
||||
applications via the ALSA sequencer, and from SMF (Standard MIDI files) or
|
||||
WRK (Cakewalk/Sonar) files. It is especially useful for debugging MIDI
|
||||
software or your MIDI setup.
|
||||
'';
|
||||
homepage = "https://github.com/pedrolcl/kmidimon";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ qweered ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-linter";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "kube-linter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-akuyMSgEtIV1+dxFlAgoVdhnKO4SyVP3pIABCjT52Kc=";
|
||||
sha256 = "sha256-wniDoImqawTdjkd/XnkeiUTMoz5WJNpRs1ZgM1Xy1hw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TETt2USmpKolx3nXk9kXknxoXpa/nRj4XZWeDvWFRZQ=";
|
||||
vendorHash = "sha256-ui6AECWJhYso3KDbX8EonML4wvbDs3cijG2yWb3KoKA=";
|
||||
|
||||
excludedPackages = [ "tool-imports" ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubectl-ai";
|
||||
version = "0.0.23";
|
||||
version = "0.0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "kubectl-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rQJHgBBMTDIa2CrWlxLubZ446PqFz5ejiFyrYRb3jec=";
|
||||
hash = "sha256-ORCOZ0U8BEpLfKa7s8Z/7spmdKebf+F2IpP252s/vQk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fvkaVdQlDT+95UTaN/zCIX8924MDoKam49U8lbq6yLs=";
|
||||
vendorHash = "sha256-l+KHc5RJKqoXTbCIM8mAbuSWBMofgqLsYltgr0ZgfWM=";
|
||||
|
||||
# Build the main command
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-explore";
|
||||
version = "0.12.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keisku";
|
||||
repo = "kubectl-explore";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D5K1jGLoEHQEacxNhxdxDs9A9ir7qs7y1pNuBU2r//Y=";
|
||||
hash = "sha256-URpoIK+5MgBvCtXyZrqwU7cVubCICkAsmfS9w/8Jgks=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vCL+gVf0BCqsdRU2xk1Xs3FYcKYB1z2wLpZ3TvYmJdc=";
|
||||
vendorHash = "sha256-TgC8IgB9E83FBP9qrgcqPesnOyOTA5u3AsXn32kaMnU=";
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-gadget";
|
||||
version = "0.44.0";
|
||||
version = "0.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inspektor-gadget";
|
||||
repo = "inspektor-gadget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h3J6RQG9CI+2U+iWINUs3JX4uEfbl0VeOXsaWuZx2dg=";
|
||||
hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubergrunt";
|
||||
version = "0.18.3";
|
||||
version = "0.18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "kubergrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qiAmUKOkVsCPIZ8mv8GfG8QU1Ps4Cg4+1NV8qCuJtBo=";
|
||||
sha256 = "sha256-yrAFm4dvujwxRVjMDlTAOjBpftxdv6kuQIIcbiVnFgU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yTi2JPLUXnORGr/31GEdwkUpqcgoJANfNbZr3dnzVzQ=";
|
||||
vendorHash = "sha256-zpYc8DurFG6Hqmf8YDSapFbHIvE1HGs5yajrLWtewO4=";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of certain AWS infrastructure
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lesspipe";
|
||||
version = "2.19";
|
||||
version = "2.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wofr06";
|
||||
repo = "lesspipe";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ=";
|
||||
hash = "sha256-yb3IzdaMiv1PwqHOfSyHvmWXyStvK/XXC49saXVAJFU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
|
||||
useTBB ? true,
|
||||
}:
|
||||
@@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals useTBB [
|
||||
# 2022.0 crashes on macOS at the moment
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk";
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls";
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code editing widget for GTK";
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
libgedit-gtksourceview
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
passthru.updateScript = gitUpdater { ignoredVersions = "(alpha|beta|rc).*"; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
gtest,
|
||||
icu,
|
||||
spdlog,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtest
|
||||
icu
|
||||
spdlog
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
|
||||
finalAttrs.passthru.yaml-cpp # has merge-key support
|
||||
finalAttrs.passthru.libloadorder
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.13";
|
||||
version = "9.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tvpucr+Yp98SYLZhe3/fGHFc0nroAILku7F/kUiNTvE=";
|
||||
hash = "sha256-qxneoz6TO52MQotRPsHqkq+zF0nz3Ef3JDcbSs2Vci8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -42,14 +42,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "9.6.6";
|
||||
version = "9.6.7";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2NEwmC7+CbR297VsjTSguzYuhxHv8YtCgtB4oTrEaU8=";
|
||||
hash = "sha256-VGn/Ny9wVKBVFW7SNTTx+u7rr519jQ+CzbcZwTTBKps=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/mobilinkd/m17-cxx-demod";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
teams = [ teams.c3d2 ];
|
||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
clipper2,
|
||||
gtest,
|
||||
glm,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
gtest
|
||||
glm
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ clipper2 ];
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tbb = tbb_2021;
|
||||
tbb = tbb_2022;
|
||||
tests = {
|
||||
python = python3Packages.manifold3d;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 5d7192b6..ce9b1302 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -3900,8 +3900,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "resolv-conf"
|
||||
-version = "0.7.4"
|
||||
-source = "git+https://forgejo.ellis.link/continuwuation/resolv-conf?rev=56251316cc4127bcbf36e68ce5e2093f4d33e227#56251316cc4127bcbf36e68ce5e2093f4d33e227"
|
||||
+version = "0.7.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799"
|
||||
|
||||
[[package]]
|
||||
name = "rgb"
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index c656e183..2942ad07 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -592,9 +592,8 @@ rev = "e4ae7628fe4fcdacef9788c4c8415317a4489941"
|
||||
|
||||
# Allows no-aaaa option in resolv.conf
|
||||
# Use 1-indexed line numbers when displaying parse error messages
|
||||
-[patch.crates-io.resolv-conf]
|
||||
-git = "https://forgejo.ellis.link/continuwuation/resolv-conf"
|
||||
-rev = "56251316cc4127bcbf36e68ce5e2093f4d33e227"
|
||||
+[workspace.dependencies.resolv-conf]
|
||||
+version = "0.7.5"
|
||||
|
||||
#
|
||||
# Our crates
|
||||
@@ -13,35 +13,86 @@
|
||||
enableBlurhashing ? true,
|
||||
# upstream continuwuity enables jemalloc by default, so we follow suit
|
||||
enableJemalloc ? true,
|
||||
rust-jemalloc-sys,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
enableLiburing ? stdenv.hostPlatform.isLinux,
|
||||
liburing,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
rust-jemalloc-sys' = rust-jemalloc-sys.override {
|
||||
unprefixed = !stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
rocksdb' = rocksdb.override {
|
||||
inherit enableLiburing;
|
||||
# rocksdb does not support prefixed jemalloc, which is required on darwin
|
||||
enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin;
|
||||
jemalloc = rust-jemalloc-sys';
|
||||
};
|
||||
rocksdb' =
|
||||
(rocksdb.override {
|
||||
inherit enableLiburing;
|
||||
# rocksdb does not support prefixed jemalloc, which is required on darwin
|
||||
enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin;
|
||||
jemalloc = rust-jemalloc-sys-unprefixed;
|
||||
}).overrideAttrs
|
||||
(
|
||||
final: old: {
|
||||
version = "10.4.2";
|
||||
src = fetchFromGitea {
|
||||
domain = "forgejo.ellis.link";
|
||||
owner = "continuwuation";
|
||||
repo = "rocksdb";
|
||||
rev = "10.4.fb";
|
||||
hash = "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
cmakeFlags =
|
||||
lib.subtractLists [
|
||||
# no real reason to have snappy or zlib, no one uses this
|
||||
(lib.cmakeBool "WITH_SNAPPY" true)
|
||||
(lib.cmakeBool "ZLIB" true)
|
||||
(lib.cmakeBool "WITH_ZLIB" true)
|
||||
# we dont need to use ldb or sst_dump (core_tools)
|
||||
(lib.cmakeBool "WITH_CORE_TOOLS" true)
|
||||
# we dont need to build rocksdb tests
|
||||
(lib.cmakeBool "WITH_TESTS" true)
|
||||
# we use rust-rocksdb via C interface and dont need C++ RTTI
|
||||
(lib.cmakeBool "USE_RTTI" true)
|
||||
# this doesn't exist in RocksDB
|
||||
(lib.cmakeBool "FORCE_SSE43" true)
|
||||
] old.cmakeFlags
|
||||
++ [
|
||||
# no real reason to have snappy, no one uses this
|
||||
(lib.cmakeBool "WITH_SNAPPY" false)
|
||||
(lib.cmakeBool "ZLIB" false)
|
||||
(lib.cmakeBool "WITH_ZLIB" false)
|
||||
# we dont need to use ldb or sst_dump (core_tools)
|
||||
(lib.cmakeBool "WITH_CORE_TOOLS" false)
|
||||
# we dont need to build rocksdb tests
|
||||
(lib.cmakeBool "WITH_TESTS" false)
|
||||
# we use rust-rocksdb via C interface and dont need C++ RTTI
|
||||
(lib.cmakeBool "USE_RTTI" false)
|
||||
(lib.cmakeBool "WITH_TRACE_TOOLS" false)
|
||||
];
|
||||
outputs = [ "out" ];
|
||||
|
||||
# We aren't building tools, the original package uses this to make sure rocksdb
|
||||
# tools work as expected. Hence we override this and make it empty.
|
||||
preInstall = "";
|
||||
}
|
||||
);
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-continuwuity";
|
||||
version = "0.5.0-rc.6";
|
||||
version = "0.5.0-rc.7";
|
||||
|
||||
# Switch back to fetchFromGitea once archive download errors are fixed
|
||||
src = fetchFromGitea {
|
||||
domain = "forgejo.ellis.link";
|
||||
owner = "continuwuation";
|
||||
repo = "continuwuity";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xK/jTURQzFJ1FkF1E9cItTxXAgXgTwAiA9/8aE51FvU=";
|
||||
hash = "sha256-u1k1r95qBoEizeILR5rrM5lDFz2a2NjUwM9TTi0HNjw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+7k1dtrXdonFDXa2Z/qVo4n1hZRmMWEQKKlffki8+/k=";
|
||||
# Patch to fix linking issue caused by resolv-conf which needs to be incorporated
|
||||
# into continuwuity upstream.
|
||||
cargoPatches = [ ./cargolock.patch ];
|
||||
|
||||
cargoHash = "sha256-1ECD8RZ918TM1IX3jkTDNhCR5Zye0a3ii0zeIPy8jlI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -52,7 +103,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
bzip2
|
||||
zstd
|
||||
]
|
||||
++ lib.optional enableJemalloc rust-jemalloc-sys'
|
||||
++ lib.optional enableJemalloc [
|
||||
rust-jemalloc-sys-unprefixed
|
||||
]
|
||||
++ lib.optional enableLiburing liburing;
|
||||
|
||||
env = {
|
||||
@@ -76,6 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"systemd"
|
||||
"url_preview"
|
||||
"zstd_compression"
|
||||
"bindgen-runtime"
|
||||
]
|
||||
++ lib.optional enableBlurhashing "blurhashing"
|
||||
++ lib.optional enableJemalloc [
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
cmake,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metee";
|
||||
version = "6.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "metee";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PwIadjg1D7WumqVgkpfnXkdUzIOjzA+b3Jjk30epAE8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ xddxdd ];
|
||||
description = "C library to access CSE/CSME/GSC firmware via a MEI interface";
|
||||
homepage = "https://github.com/intel/metee";
|
||||
license = lib.licenses.asl20;
|
||||
changelog = "https://github.com/intel/metee/releases/tag/${finalAttrs.version}";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -127,7 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
mainProgram = "mold";
|
||||
maintainers = with lib.maintainers; [ azahi ];
|
||||
};
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "monetdb";
|
||||
version = "11.53.9";
|
||||
version = "11.53.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-qltKYPEWU5w3SIJumxunUTwC//egn7UtvmcFL+bxIUk=";
|
||||
hash = "sha256-CTTLztClNXLFAFo0xsMqSb+FSbkEx+1E2+j/ljfME2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "mumps";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
# makeFlags contain space and one should use makeFlagsArray+
|
||||
# Setting this magic var is an optional solution
|
||||
__structuredAttrs = true;
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-opJW7+Z/YhyUFwYTTTuWZuykz8Z4do6/XTBThHyTVCs=";
|
||||
hash = "sha256-60hNYhbHONv9E9VY8G0goE83q7AwJh1u/Z+QRK8anHQ=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
pkg-config,
|
||||
python3,
|
||||
sphinx,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
buildPackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
capnproto # cmake modules
|
||||
flex # include dir
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
python3
|
||||
];
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nakama";
|
||||
version = "3.30.0";
|
||||
version = "3.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "heroiclabs";
|
||||
repo = "nakama";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G+cNR4Ny8aR3ByuKvrCTp3U+GXpdYaHlrZqifoWDce0=";
|
||||
hash = "sha256-e31Mn4Ma+7vjOtwV13w79AshN9LCg2V0V3h9sSaad1U=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ncurses,
|
||||
texinfo6,
|
||||
texinfo,
|
||||
texliveMedium,
|
||||
perl,
|
||||
ghostscript,
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
texliveMedium
|
||||
texinfo6
|
||||
texinfo
|
||||
perl
|
||||
ghostscript
|
||||
];
|
||||
|
||||
@@ -35,13 +35,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netgen";
|
||||
version = "6.2.2504";
|
||||
version = "6.2.2505";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngsolve";
|
||||
repo = "netgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N4mmh2H2qvc+3Pa9CHm38arViI76Qvwp8fOVGZbMv1M=";
|
||||
hash = "sha256-MPnibhDzNjqmpW5C76KdeYoZGfKLU0KJ20EnjrK1S+Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -114,11 +114,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libjpeg
|
||||
ffmpeg
|
||||
mpi
|
||||
python3Packages.pybind11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
packaging
|
||||
pybind11
|
||||
mpi4py
|
||||
numpy
|
||||
];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
nixVersions,
|
||||
nixComponents ? nixVersions.nixComponents_2_30,
|
||||
cmake,
|
||||
@@ -12,24 +11,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-plugins";
|
||||
version = "15.0.0";
|
||||
version = "16.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-plugins";
|
||||
rev = version;
|
||||
hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM=";
|
||||
hash = "sha256-yofHs1IyAkyMqrWlLkmnX+CmH+qsvlhKN1YZM4nRf1M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/shlevy/nix-plugins/pull/22
|
||||
(fetchpatch2 {
|
||||
name = "fix-build-nix-2.28.patch";
|
||||
url = "https://github.com/shlevy/nix-plugins/commit/7279e18911fede252b95765d3920dd38b206271a.patch";
|
||||
hash = "sha256-Mwjxg7IUVrBefGz1iRJBGqkVCDqG1v8qT4StrINkXH8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-displays";
|
||||
version = "0.3.25";
|
||||
version = "0.3.26";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-displays";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Om5kz3mtrQPd5aHZwf/9BBDnPfSzMhyRp05MqX+7XzQ=";
|
||||
hash = "sha256-UeALCkmDAXb/gu+Mp3xnHmUPOvYHk3LzegO2CbIh4ak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
|
||||
index 3dd2ea4..aeae6e9 100644
|
||||
--- a/cl_headers/CMakeLists.txt
|
||||
+++ b/cl_headers/CMakeLists.txt
|
||||
@@ -11,12 +11,14 @@ add_custom_command(
|
||||
)
|
||||
endfunction(copy_file)
|
||||
|
||||
-if(USE_PREBUILT_LLVM)
|
||||
- set(OPENCL_HEADERS_DIR
|
||||
- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
|
||||
-else(USE_PREBUILT_LLVM)
|
||||
- set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
|
||||
-endif(USE_PREBUILT_LLVM)
|
||||
+if(NOT DEFINED OPENCL_HEADERS_DIR)
|
||||
+ if(USE_PREBUILT_LLVM)
|
||||
+ set(OPENCL_HEADERS_DIR
|
||||
+ "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
|
||||
+ else(USE_PREBUILT_LLVM)
|
||||
+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
|
||||
+ endif(USE_PREBUILT_LLVM)
|
||||
+endif()
|
||||
copy_file(${OPENCL_HEADERS_DIR}/opencl-c.h opencl-c.h)
|
||||
|
||||
add_custom_target (
|
||||
@@ -1,123 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
applyPatches,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
git,
|
||||
llvmPackages_15,
|
||||
spirv-llvm-translator,
|
||||
buildWithPatches ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
addPatches =
|
||||
component: pkg:
|
||||
pkg.overrideAttrs (oldAttrs: {
|
||||
postPatch = oldAttrs.postPatch or "" + ''
|
||||
for p in ${passthru.patchesOut}/${component}/*; do
|
||||
patch -p1 -i "$p"
|
||||
done
|
||||
'';
|
||||
});
|
||||
|
||||
llvmPkgs = llvmPackages_15;
|
||||
inherit (llvmPkgs) llvm;
|
||||
spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };
|
||||
libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang;
|
||||
|
||||
passthru = rec {
|
||||
spirv-llvm-translator = spirv-llvm-translator';
|
||||
llvm = addPatches "llvm" llvmPkgs.llvm;
|
||||
libclang = addPatches "clang" llvmPkgs.libclang;
|
||||
|
||||
clang-unwrapped = libclang.out;
|
||||
clang = llvmPkgs.clang.override {
|
||||
cc = clang-unwrapped;
|
||||
};
|
||||
|
||||
patchesOut = stdenv.mkDerivation {
|
||||
pname = "opencl-clang-patches";
|
||||
inherit version src;
|
||||
# Clang patches assume the root is the llvm root dir
|
||||
# but clang root in nixpkgs is the clang sub-directory
|
||||
postPatch = ''
|
||||
for filename in patches/clang/*.patch; do
|
||||
substituteInPlace "$filename" \
|
||||
--replace-fail "a/clang/" "a/" \
|
||||
--replace-fail "b/clang/" "b/"
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
[ -d patches ] && cp -r patches/ $out || mkdir $out
|
||||
mkdir -p $out/clang $out/llvm
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
version = "15.0.3";
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "opencl-clang";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Build script tries to find Clang OpenCL headers under ${llvm}
|
||||
# Work around it by specifying that directory manually.
|
||||
./opencl-headers-dir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# fix not be able to find clang from PATH
|
||||
substituteInPlace cl_headers/CMakeLists.txt \
|
||||
--replace-fail " NO_DEFAULT_PATH" ""
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Uses linker flags that are not supported on Darwin.
|
||||
sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail '-Wl,--no-undefined' ""
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opencl-clang";
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
llvm.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libclang
|
||||
llvm
|
||||
spirv-llvm-translator'
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}"
|
||||
"-DOPENCL_HEADERS_DIR=${lib.getLib libclang}/lib/clang/${lib.getVersion libclang}/include/"
|
||||
|
||||
"-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF"
|
||||
"-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}"
|
||||
];
|
||||
|
||||
inherit passthru;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/intel/opencl-clang/";
|
||||
description = "Clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules";
|
||||
license = licenses.ncsa;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
# error: invalid value 'CL3.0' in '-cl-std=CL3.0'
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
@@ -22,12 +22,12 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RU4Qq2xGPOdK/GxHAcAaJYrx31ZhZ/fFuOmvyqqr538=";
|
||||
hash = "sha256-Bpxb9BLMxF2z42Ok/yVxEvVmmKxh+WWY2kHyCAHrCx4=";
|
||||
};
|
||||
|
||||
tui = buildGoModule {
|
||||
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
modRoot = "packages/tui";
|
||||
|
||||
vendorHash = "sha256-u7jomV6lzr5QMICJ20ED6oAe7euXjsRUjuPl/YiTBfk=";
|
||||
vendorHash = "sha256-de5FtS7iMrbmoLlIjdfrxs2OEI/f1dfU90GIJbvdO50=";
|
||||
|
||||
subPackages = [ "cmd/opencode" ];
|
||||
|
||||
|
||||
@@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ arezvov ];
|
||||
teams = [ teams.c3d2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
opencv,
|
||||
pcre,
|
||||
systemd,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
webkitgtk_4_1,
|
||||
wxGTK31,
|
||||
xorg,
|
||||
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
opencascade-occt_7_6
|
||||
openvdb
|
||||
pcre
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
webkitgtk_4_1
|
||||
wxGTK'
|
||||
xorg.libX11
|
||||
|
||||
@@ -170,6 +170,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
"django-allauth"
|
||||
"django-guardian"
|
||||
"filelock"
|
||||
"ocrmypdf"
|
||||
"rapidfuzz"
|
||||
"redis"
|
||||
];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
qt6,
|
||||
wrapGAppsHook3,
|
||||
openjpeg,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
blend2d,
|
||||
}:
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6.qtspeech
|
||||
lcms
|
||||
openjpeg
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
blend2d
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
{
|
||||
alsa-lib,
|
||||
autoPatchelfHook,
|
||||
buildFHSEnv,
|
||||
elfutils,
|
||||
extraEnv ? { },
|
||||
fetchurl,
|
||||
ffmpeg_6-headless,
|
||||
lib,
|
||||
libdrm,
|
||||
libgbm,
|
||||
libpulseaudio,
|
||||
libva,
|
||||
libxkbcommon,
|
||||
libxml2_13,
|
||||
makeShellWrapper,
|
||||
minizip,
|
||||
nss,
|
||||
squashfsTools,
|
||||
stdenv,
|
||||
writeShellScript,
|
||||
xkeyboard_config,
|
||||
xorg,
|
||||
}:
|
||||
let
|
||||
pname = "plex-htpc";
|
||||
version = "1.71.1";
|
||||
rev = "73";
|
||||
meta = {
|
||||
homepage = "https://plex.tv/";
|
||||
description = "Plex HTPC client for the big screen";
|
||||
longDescription = ''
|
||||
Plex HTPC for Linux is your client for playing on your Linux computer
|
||||
connected to the big screen. It features a 10-foot interface with a
|
||||
powerful playback engine.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ detroyejr ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "plex-htpc";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
plex-htpc = stdenv.mkDerivation {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/81OP06hEXlwmMrpMAhe5hyLy5bQ9q6Kz_${rev}.snap";
|
||||
hash = "sha512-n9pXRx8s6AwhIJm7PmUIOB8pXqzyNFzdmwJMonQ4WzWvA5tPI27x0slQ6WUxRBQJoLScGckyGAFxIGWRylNr3g==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeShellWrapper
|
||||
squashfsTools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
elfutils
|
||||
ffmpeg_6-headless
|
||||
libgbm
|
||||
libpulseaudio
|
||||
libva
|
||||
libxkbcommon
|
||||
libxml2_13
|
||||
minizip
|
||||
nss
|
||||
stdenv.cc.cc
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXinerama
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXtst
|
||||
xorg.libxshmfence
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilkeysyms
|
||||
xorg.xcbutilrenderutil
|
||||
xorg.xcbutilwm
|
||||
xorg.xrandr
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
unsquashfs "$src"
|
||||
cd squashfs-root
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r . $out
|
||||
rm -r $out/etc
|
||||
rm -r $out/usr
|
||||
|
||||
# flatpak removes these during installation.
|
||||
rm -r $out/lib/dri
|
||||
rm $out/lib/libpciaccess.so*
|
||||
rm $out/lib/libswresample.so*
|
||||
rm $out/lib/libva-*.so*
|
||||
rm $out/lib/libva.so*
|
||||
rm $out/lib/libEGL.so*
|
||||
rm $out/lib/libdrm.so*
|
||||
rm $out/lib/libdrm*
|
||||
|
||||
# Keep some dependencies from the snap.
|
||||
cp usr/lib/x86_64-linux-gnu/liblcms2.so.2 $out/lib/liblcms2.so.2
|
||||
cp usr/lib/x86_64-linux-gnu/libjbig.so.0 $out/lib/libjbig.so.0
|
||||
cp usr/lib/x86_64-linux-gnu/libjpeg.so.8 $out/lib/libjpeg.so.8
|
||||
cp usr/lib/x86_64-linux-gnu/libpci.so.3 $out/lib/libpci.so.3
|
||||
cp usr/lib/x86_64-linux-gnu/libsnappy.so.1 $out/lib/libsnappy.so.1
|
||||
cp usr/lib/x86_64-linux-gnu/libtiff.so.5 $out/lib/libtiff.so.5
|
||||
cp usr/lib/x86_64-linux-gnu/libwebp.so.6 $out/lib/libwebp.so.6
|
||||
cp usr/lib/x86_64-linux-gnu/libxkbfile.so.1 $out/lib/libxkbfile.so.1
|
||||
cp usr/lib/x86_64-linux-gnu/libxslt.so.1 $out/lib/libxslt.so.1
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildFHSEnv {
|
||||
inherit pname version meta;
|
||||
targetPkgs = pkgs: [
|
||||
alsa-lib
|
||||
libdrm
|
||||
xkeyboard_config
|
||||
];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps
|
||||
install -m 444 -D ${plex-htpc}/meta/gui/plex-htpc.desktop $out/share/applications/plex-htpc.desktop
|
||||
substituteInPlace $out/share/applications/plex-htpc.desktop \
|
||||
--replace-fail \
|
||||
'Icon=''${SNAP}/meta/gui/icon.png' \
|
||||
'Icon=${plex-htpc}/meta/gui/icon.png'
|
||||
'';
|
||||
|
||||
runScript = writeShellScript "plex-htpc.sh" ''
|
||||
# Widevine won't download unless this directory exists.
|
||||
mkdir -p $HOME/.cache/plex/
|
||||
|
||||
# Copy the sqlite plugin database on first run.
|
||||
PLEX_DB="$HOME/.local/share/plex/Plex Media Server/Plug-in Support/Databases"
|
||||
if [[ ! -d "$PLEX_DB" ]]; then
|
||||
mkdir -p "$PLEX_DB"
|
||||
cp "${plex-htpc}/resources/com.plexapp.plugins.library.db" "$PLEX_DB"
|
||||
fi
|
||||
|
||||
# db files should have write access.
|
||||
chmod --recursive 750 "$PLEX_DB"
|
||||
|
||||
# These environment variables sometimes silently cause plex to crash.
|
||||
unset QT_QPA_PLATFORM QT_STYLE_OVERRIDE
|
||||
|
||||
set -o allexport
|
||||
${lib.toShellVars extraEnv}
|
||||
set +o allexport
|
||||
exec ${plex-htpc}/Plex.sh
|
||||
'';
|
||||
passthru.updateScript = ./update.sh;
|
||||
}
|
||||
Executable
+71
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl jq git gnused gnugrep
|
||||
|
||||
|
||||
# executing this script without arguments will
|
||||
# - find the newest stable plex-htpc version avaiable on snapcraft (https://snapcraft.io/plex-htpc)
|
||||
# - read the current plex-htpc version from the current nix expression
|
||||
# - update the nix expression if the versions differ
|
||||
# - try to build the updated version, exit if that fails
|
||||
# - give instructions for upstreaming
|
||||
|
||||
# As an optional argument you can specify the snapcraft channel to update to.
|
||||
# Default is `stable` and only stable updates should be pushed to nixpkgs. For
|
||||
# testing you may specify `candidate` or `edge`.
|
||||
|
||||
|
||||
channel="${1:-stable}" # stable/candidate/edge
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
plex_nix="$nixpkgs/pkgs/by-name/pl/plex-htpc/package.nix"
|
||||
|
||||
|
||||
#
|
||||
# find the newest stable plex-htpc version avaiable on snapcraft
|
||||
#
|
||||
|
||||
# create bash array from snap info
|
||||
snap_info=($(
|
||||
curl -s -H 'X-Ubuntu-Series: 16' \
|
||||
"https://api.snapcraft.io/api/v1/snaps/details/plex-htpc?channel=$channel" \
|
||||
| jq --raw-output \
|
||||
'.revision,.download_sha512,.version,.last_updated'
|
||||
))
|
||||
|
||||
# "revision" is the actual version identifier on snapcraft, the "version" is
|
||||
# just for human consumption. Revision is just an integer that gets increased
|
||||
# by one every (stable or unstable) release.
|
||||
revision="${snap_info[0]}"
|
||||
# We need to escape the slashes
|
||||
hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')"
|
||||
upstream_version="${snap_info[2]}"
|
||||
last_updated="${snap_info[3]}"
|
||||
echo "Latest $channel release is $upstream_version from $last_updated."
|
||||
#
|
||||
# read the current plex-htpc version from the currently *committed* nix expression
|
||||
#
|
||||
|
||||
current_version=$(
|
||||
grep 'version\s*=' "$plex_nix" \
|
||||
| sed -Ene 's/.*"(.*)".*/\1/p'
|
||||
)
|
||||
|
||||
echo "Current version: $current_version"
|
||||
|
||||
#
|
||||
# update the nix expression if the versions differ
|
||||
#
|
||||
|
||||
if [[ "$current_version" == "$upstream_version" ]]; then
|
||||
echo "Plex is already up-to-date"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Updating from ${current_version} to ${upstream_version}, released on ${last_updated}"
|
||||
|
||||
# search-and-replace revision, hash and version
|
||||
sed --regexp-extended \
|
||||
-e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \
|
||||
-e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \
|
||||
-e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \
|
||||
-i "$plex_nix"
|
||||
|
||||
@@ -70,13 +70,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "5.6.0";
|
||||
version = "5.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0w22mEbp1RRQlVqAKx0oHG0dVoC6m6Oo2l5RaL05t/A=";
|
||||
hash = "sha256-i1AXjLg28VV5vHMdywlCHB9kIALXToVx/4ujaNe9Dc0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,3 +1,17 @@
|
||||
/**
|
||||
# Example
|
||||
|
||||
Prettier with plugins and Vim Home Manager configuration
|
||||
|
||||
```nix
|
||||
pkgs.prettier.override {
|
||||
plugins = with pkgs.nodePackages; [
|
||||
prettier-plugin-toml
|
||||
# ...
|
||||
];
|
||||
}
|
||||
```
|
||||
*/
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
@@ -6,7 +20,109 @@
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
yarn-berry,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
let
|
||||
/**
|
||||
# Example
|
||||
|
||||
```nix
|
||||
exportRelativePathOf (builtins.fromJSON "./package.json")
|
||||
=>
|
||||
lib/node_modules/prettier-plugin-toml/./lib/index.cjs
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
exportRelativePathOf :: AttrSet => String
|
||||
```
|
||||
|
||||
# Arguments
|
||||
|
||||
packageJsonAttrs
|
||||
: Attribute set with shape similar to `package.json` file
|
||||
*/
|
||||
## Blame NodeJS
|
||||
exportRelativePathOf =
|
||||
let
|
||||
nodeExportAttrAddresses = [
|
||||
[ "main" ]
|
||||
[
|
||||
"exports"
|
||||
"."
|
||||
"default"
|
||||
]
|
||||
[
|
||||
"exports"
|
||||
"."
|
||||
]
|
||||
[
|
||||
"exports"
|
||||
"default"
|
||||
]
|
||||
[ "exports" ]
|
||||
];
|
||||
|
||||
recAttrByPath =
|
||||
addresses: default: attrs:
|
||||
if builtins.length addresses == 0 then
|
||||
default
|
||||
else
|
||||
let
|
||||
addressNext = builtins.head addresses;
|
||||
addressesRemaning = lib.lists.drop 1 addresses;
|
||||
in
|
||||
lib.attrByPath addressNext (recAttrByPath addressesRemaning default attrs) attrs;
|
||||
in
|
||||
packageJsonAttrs:
|
||||
recAttrByPath nodeExportAttrAddresses (builtins.head (
|
||||
lib.attrByPath [ "prettier" "plugins" ] [ "null" ] packageJsonAttrs
|
||||
)) packageJsonAttrs;
|
||||
|
||||
/**
|
||||
# Example
|
||||
|
||||
```nix
|
||||
nodeEntryPointOf pkgs.nodePackages.prettier-plugin-toml
|
||||
=>
|
||||
/nix/store/<NAR_HASH>-prettier-plugin-toml-<VERSION>/lib/node_modules/prettier-plugin-toml/./lib/index.cjs
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
nodeEntryPointOf :: AttrSet => String
|
||||
```
|
||||
|
||||
# Arguments
|
||||
|
||||
plugin
|
||||
: Attribute set with `.packageName` and `.outPath` defined
|
||||
*/
|
||||
nodeEntryPointOf =
|
||||
plugin:
|
||||
let
|
||||
pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.packageName}";
|
||||
|
||||
packageJsonAttrs = builtins.fromJSON (builtins.readFile "${pluginDir}/package.json");
|
||||
|
||||
exportPath = exportRelativePathOf packageJsonAttrs;
|
||||
|
||||
pathAbsoluteNaive = "${pluginDir}/${exportPath}";
|
||||
pathAbsoluteFallback = "${pluginDir}/${exportPath}.js";
|
||||
in
|
||||
if builtins.pathExists pathAbsoluteNaive then
|
||||
pathAbsoluteNaive
|
||||
else if builtins.pathExists pathAbsoluteFallback then
|
||||
pathAbsoluteFallback
|
||||
else
|
||||
lib.warn ''
|
||||
${plugin.packageName}: error context, tried finding entry point under;
|
||||
pathAbsoluteNaive -> ${pathAbsoluteNaive}
|
||||
pathAbsoluteFallback -> ${pathAbsoluteFallback}
|
||||
'' throw ''${plugin.packageName}: does not provide parse-able entry point'';
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prettier";
|
||||
version = "3.6.2";
|
||||
@@ -41,7 +157,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeBinaryWrapper "${lib.getExe nodejs}" "$out/bin/prettier" \
|
||||
--add-flags "$out/bin/prettier.cjs"
|
||||
|
||||
''
|
||||
+ lib.optionalString (builtins.length plugins > 0) ''
|
||||
wrapProgram $out/bin/prettier --add-flags "${
|
||||
builtins.concatStringsSep " " (lib.map (plugin: "--plugin=${nodeEntryPointOf plugin}") plugins)
|
||||
}";
|
||||
''
|
||||
+ ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -57,6 +179,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://prettier.io/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "prettier";
|
||||
maintainers = with lib.maintainers; [ l0b0 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
l0b0
|
||||
S0AndS0
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -27,6 +27,6 @@ buildGoModule {
|
||||
mainProgram = "protoscope";
|
||||
homepage = "https://github.com/protocolbuffers/protoscope";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "redlib";
|
||||
version = "0.36.0-unstable-2025-07-21";
|
||||
version = "0.36.0-unstable-2025-09-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "redlib-org";
|
||||
repo = "redlib";
|
||||
rev = "3e67694e2b9a4012b259264af5f2b81807dbadf0";
|
||||
hash = "sha256-vFK9DiVANbTKi19DCWdRG8gKKwcyoAcLa1teXCZ9nfE=";
|
||||
rev = "a989d19ca92713878e9a20dead4252f266dc4936";
|
||||
hash = "sha256-YJZVkCi8JQ1U47s52iOSyyf32S3b35pEqw4YTW8FHVY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FDeENHY6bwwCq6leSoIuCqPI6PCHpEod7KN2grS2gFw=";
|
||||
cargoHash = "sha256-L35VSQdIbKGGsBPU2Sj/MoYohy1ZibgZ+7NVa3yNjH8=";
|
||||
|
||||
postInstall = ''
|
||||
install -D contrib/redlib.service $out/lib/systemd/system/redlib.service
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "release-plz";
|
||||
version = "0.3.142";
|
||||
version = "0.3.147";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoIeni";
|
||||
repo = "release-plz";
|
||||
rev = "release-plz-v${version}";
|
||||
hash = "sha256-e+EafNBXHUAE4UjJJ7ujfd4QVxQ6AAYTpH6TmNot6jk=";
|
||||
hash = "sha256-obqPPVUh5m24A3L8WlJxDK2Nbgb57tATNQ5k8JH/dN4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TE2l9Mk41RBaHo/fRdXSLHc8UGiMDIY6LXc33iIDjvA=";
|
||||
cargoHash = "sha256-t42CsSk6i9ABJOnzqAt5cQS4VS73yjFTzhfK8YVpMZ8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "rename";
|
||||
version = "1.11";
|
||||
version = "1.16.3";
|
||||
outputs = [ "out" ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "pstray";
|
||||
repo = "rename";
|
||||
rev = "v${version}";
|
||||
sha256 = "SK6wS3IxjCftuDiiZU27TFnn9GVd137zmzvGH88cNLI=";
|
||||
sha256 = "KQsBO94fsa4CbTHNyJxOD96AwUfKNLa9p44odlNgQao=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Rename files according to a Perl rewrite expression";
|
||||
@@ -20,6 +20,7 @@ perlPackages.buildPerlPackage rec {
|
||||
maintainers = with maintainers; [
|
||||
mkg
|
||||
cyplo
|
||||
cfouche
|
||||
];
|
||||
license = with licenses; [ gpl1Plus ];
|
||||
mainProgram = "rename";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runpodctl";
|
||||
version = "1.14.4";
|
||||
version = "1.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runpod";
|
||||
repo = "runpodctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QU2gujECzT5mPkZi6siMO7IZRXNZHS0TchYxnG4Snj8=";
|
||||
hash = "sha256-RXI1NAdEg5QypRDXg0NCpHLDrxcRCCS22KGnZyotXrI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8/OrM8zrisAfZdeo6FGP6+quKMwjxel1BaRIY+yJq5E=";
|
||||
vendorHash = "sha256-SaaHVaN2r3DhUk7sVizhRggYZRujd+e8qbpq0xOVD88=";
|
||||
|
||||
postInstall = ''
|
||||
rm $out/bin/docs # remove the docs binary
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "safecloset";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "safecloset";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1NvBNITb/KmUC2c+vchvyL9yZbK9xj5Es7AXYg0U9mE=";
|
||||
hash = "sha256-pTfslMZmP8YzLzTru3b64qQ9qefkPzo9V8/S6eSQBgM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VXxDD/2FFg3uQBdKdHsWOeLfOoCTYdaF+OZJVeQC6gE=";
|
||||
cargoHash = "sha256-b0MD30IJRp06qkYsQsiEI7c4ArY3GCSIh8I16/4eom0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
xorg.libxcb
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
libiconv,
|
||||
libstaden-read,
|
||||
pkg-config,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
xz,
|
||||
zlib,
|
||||
}:
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
jemalloc
|
||||
libgff
|
||||
libstaden-read
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
xz
|
||||
zlib
|
||||
]
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
boost,
|
||||
blas,
|
||||
gmp,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
gfortran,
|
||||
}:
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
gmp
|
||||
gfortran
|
||||
boost
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
scipopt-papilo,
|
||||
scipopt-zimpl,
|
||||
ipopt,
|
||||
tbb_2021,
|
||||
tbb_2022,
|
||||
boost,
|
||||
gfortran,
|
||||
criterion,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
gmp
|
||||
readline
|
||||
zlib
|
||||
tbb_2021
|
||||
tbb_2022
|
||||
boost
|
||||
gfortran
|
||||
criterion
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416
|
||||
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sing-box";
|
||||
version = "1.12.5";
|
||||
version = "1.12.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = "sing-box";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LTORUt3/Q8eyfMkWjk/ixyRHB8NGvthbIJdcgOR3WaA=";
|
||||
hash = "sha256-4+t90/oJtg93f+cLc2licyqLsQKy3Vh53gEUmTppPdc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XoHIxsJaFkC/Qz0+9AXWL+LBiTFUYKDtMqNseruAqZY=";
|
||||
vendorHash = "sha256-q06yWv0K/BMplGcIlAufx1HiGb4AEJ4UioeAhPoQce0=";
|
||||
|
||||
tags = [
|
||||
"with_quic"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user