Merge master into staging-next
This commit is contained in:
@@ -80,7 +80,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flatpak";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [
|
||||
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-aRctGw2Fxo+B5t3wEV+OGwXXOxsBD+qNnssDvIrYQ+s=";
|
||||
hash = "sha256-PWvT9fiUDoDAhyhso+QhgvxjDXgIlFNlEfzSz/wSz1s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fresh";
|
||||
version = "0.2.3";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinelaw";
|
||||
repo = "fresh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nWMqO4O3Z2SBWYKtAmVci4w8oPepjvJA+MhHdMVkaHw=";
|
||||
hash = "sha256-JbjTHMvncM5wCiPa3Tmv/HJbg7sKgmOXhmu9He6Tzhk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hi/b9kjKIDGI5RWcYIGVSS9IJyHjt6UxB7zbdRYpLUE=";
|
||||
cargoHash = "sha256-1b9v7K+EUOtHF3J3vOv1YyFxqnGZ5SbzyUBPCQ5i90U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ggml";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "ggml";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qi2ztJdDn3QVy6O1sAOHnWiVn8iDfEM5ijwuvDRMJ1E=";
|
||||
hash = "sha256-xTNDenY+1Tf7Nqr/EnXtYejpqU/guemySKR2WFvY9d0=";
|
||||
};
|
||||
|
||||
# The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-ecoflow-exporter";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tess1o";
|
||||
repo = "go-ecoflow-exporter";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oh/i4LToGnI2TuforL36tIYrhq4VUNNYVtYgaU2sf8w=";
|
||||
hash = "sha256-y273U4314oydC94sdFKiAEoZ7n4bYgiUxXf71p82qAc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UbV6V06zxXMTd0v+rDPGoMFn9X5mMCiX41g49IGnoT8=";
|
||||
vendorHash = "sha256-hsyEv+K8qL9KOrh5L6meeBOvE/WQ4F6hGBY5bWN0EFE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -28,11 +28,11 @@
|
||||
let
|
||||
rootSrc = stdenv.mkDerivation {
|
||||
pname = "iEDA-src";
|
||||
version = "0.1.0-unstable-2025-12-16";
|
||||
version = "0.1.0-unstable-2025-12-23";
|
||||
src = fetchgit {
|
||||
url = "https://gitee.com/oscc-project/iEDA";
|
||||
rev = "b73be0f1909294b56b2dbb27dba04b6cd9e0070d";
|
||||
sha256 = "sha256-bvSHfQXDk7caTELtjgpSZhJdYfRzfk9VmFm2iBW2lRw=";
|
||||
rev = "59662dcd768165f3957003522cb929d42b252023";
|
||||
sha256 = "sha256-LaFGp9U7K+HmvHW1XK6HyUB/WM5O3y/tngul+cdbCP4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mongodb-atlas-cli";
|
||||
version = "1.52.1";
|
||||
version = "1.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongodb-atlas-cli";
|
||||
tag = "atlascli/v${finalAttrs.version}";
|
||||
hash = "sha256-cczro985Oj0fwsR1Xfymo0BagCYPDxVuC9Cf/e7a/yE=";
|
||||
hash = "sha256-BOqXkm7PJAZUx1fuuTXhrubgWcI6MNiS6nBIRQEILVY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YdGZmPOCIBjaUtLLrqw2I4cXcAiaNzAzqaNszndw+ZY=";
|
||||
vendorHash = "sha256-ANwv4OGmMcdPssMzDIYGPPDjdQqqlCqxx9UR5nMf3Jo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "oxlint";
|
||||
version = "1.47.0";
|
||||
version = "1.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "oxc";
|
||||
tag = "oxlint_v${finalAttrs.version}";
|
||||
hash = "sha256-fzM+sVCQmZkBfMbD/Ko6R2zwosgOe0xJWBgOKbJ26uY=";
|
||||
hash = "sha256-E5LR3l1cYfg+cc8RspIloJkEEzr7bjesQ3r3KJtLJPc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e5DqyFqK/imxEkRchycpDZp+7B1lXdsYJLzVNzzQ7Kw=";
|
||||
cargoHash = "sha256-FF+Ju/pYMc/Af8u9qnP+vPxYAgvgCyZd6aEmChnU5kQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
bubblewrap,
|
||||
oniguruma,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
@@ -19,7 +21,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-SRIv/dZcyKm2E7c5/LtMCDnh+SDqPhJ01GZtkj0RgA0=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [ oniguruma ];
|
||||
|
||||
# use system oniguruma since the bundled one fails to build with gcc15
|
||||
env.RUSTONIG_SYSTEM_LIBONIG = 1;
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/pipr" --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
|
||||
'';
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2026-02-12";
|
||||
version = "0-unstable-2026-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "ce44214c045bc223217f4e969a2b2d3f249b7c21";
|
||||
hash = "sha256-8GPeedY0CKjJ/HJmRZj91FIVuMPNmEKamWnKV6hFrk8=";
|
||||
rev = "bf658f25df2c830b76166ce77350f62e90834365";
|
||||
hash = "sha256-9sGomOK0GCeUHDjo6HwKHLXR6DC/V1I7ev6Co/7FpXc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G/XTWobysyzONctabYDIfAQ/zaAA9w2Ky7Hn6cj9l/c=";
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prose";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgdavey";
|
||||
repo = "prose";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e3NkG05ZKpUmlxO4cJbEvCZbrp7tg9rP0jMCAzYFVCI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6LRQ94ZtnlSCM1pRMhPGDSDEacFEUL0UiQAfoZZ3MMM=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A CLI utility to reformat text";
|
||||
homepage = "https://github.com/jgdavey/prose";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ MoritzBoehme ];
|
||||
mainProgram = "prose";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "reef";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZStud";
|
||||
repo = "reef";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FP7cnqYIICb4JCYk9ytvSp4yxW+xW2SUVqhELdTGLZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UmazwJqsWXQK3bniDLyNCLXHrgrF3iHRPugOAkRzhv8=";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 fish/functions/*.fish -t $out/share/fish/vendor_functions.d/
|
||||
install -Dm644 fish/conf.d/reef.fish -t $out/share/fish/vendor_conf.d/
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Bash compatibility layer for fish shell";
|
||||
homepage = "https://github.com/ZStud/reef";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ nadir-ishiguro ];
|
||||
mainProgram = "reef";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "shoko";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShokoAnime";
|
||||
repo = "ShokoServer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qEy+BmvPeog+AIPNlIjD7UMdaN3YxPRt/ZLkTumsfSc=";
|
||||
hash = "sha256-gZK0NUwPKhrrIjdnfwNI0s618qnTf1cYBgPkwajSTEw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sing-box";
|
||||
version = "1.12.21";
|
||||
version = "1.12.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = "sing-box";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-glBNYPgjXt2xd3MehiNe8W0OXEigsuhVVbEZ7QRDhDI=";
|
||||
hash = "sha256-dLgvI3E5zQWNHxIIUi1WLs62rc3A3lwDpHjq1n09KXM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CSAXPvXMUwD08fsp66vr1pA4Wxy0rY2cEJU1Pl0mdUA=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.58";
|
||||
version = "3.16.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DT9HK9iYTmXUfjKcTxLRMZOeCLb9CAoFEpBiDpEku3g=";
|
||||
hash = "sha256-gPG7wu3K0wLwpV0nPJt7sIrLP3PrgOS/4POM5zwerVs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
writeScript,
|
||||
qt5,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
@@ -13,6 +12,10 @@
|
||||
gtk3,
|
||||
pango,
|
||||
libxcb,
|
||||
dbus,
|
||||
procps,
|
||||
runCommand,
|
||||
xwayland-run,
|
||||
}:
|
||||
let
|
||||
pname = "synology-drive-client";
|
||||
@@ -84,7 +87,46 @@ let
|
||||
substituteInPlace $out/bin/synology-drive --replace /opt $out/opt
|
||||
'';
|
||||
|
||||
passthru = { inherit updateScript; };
|
||||
passthru = {
|
||||
inherit updateScript;
|
||||
tests = {
|
||||
wl =
|
||||
runCommand "${pname}-wayland"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
linux
|
||||
(xwayland-run.override {
|
||||
withDbus = true;
|
||||
})
|
||||
procps
|
||||
];
|
||||
}
|
||||
''
|
||||
export HOME=$TMPDIR
|
||||
export QT_QPA_PLATFORM=xcb
|
||||
|
||||
xwfb-run -c weston -- \
|
||||
dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- sh -c '
|
||||
echo "Starting Synology Drive..."
|
||||
synology-drive
|
||||
|
||||
sleep 5
|
||||
|
||||
echo "Checking synology sub-processes..."
|
||||
if pgrep -f cloud-drive-connec[t] > /dev/null; then
|
||||
echo "Synology sub-processes found."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Error: synology sub-processes not found."
|
||||
ps -ef | grep "cloud-drive" | grep -v "grep" || echo "No cloud-drive processes found at all."
|
||||
exit 1
|
||||
'
|
||||
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
darwin = stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
|
||||
pkg-config,
|
||||
|
||||
oniguruma,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ugdb";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ftilde";
|
||||
repo = "ugdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-6mlvr/2hqwu5Zoo9E2EfOmyg0yEGBi4jk3BsRZ+zkN8=";
|
||||
};
|
||||
|
||||
buildInputs = [ oniguruma ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoHash = "sha256-+J4gwjQXB905yk4b2GwpamXO/bHpwqMxw6GsnusbJKU=";
|
||||
|
||||
RUSTONIG_SYSTEM_LIBONIG = 1;
|
||||
|
||||
# Upstream has a failing test :<
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Alternative TUI for gdb";
|
||||
homepage = "https://github.com/ftilde/ugdb";
|
||||
changelog = "https://github.com/ftilde/ugdb/blob/master/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.justdeeevin ];
|
||||
mainProgram = "ugdb";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1,31 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildRebar3,
|
||||
fetchHex,
|
||||
}:
|
||||
|
||||
{
|
||||
name,
|
||||
version,
|
||||
sha256,
|
||||
builder ? buildRebar3,
|
||||
hexPkg ? name,
|
||||
...
|
||||
}@attrs:
|
||||
|
||||
let
|
||||
pkg =
|
||||
self:
|
||||
builder (
|
||||
attrs
|
||||
// {
|
||||
|
||||
src = fetchHex {
|
||||
pkg = hexPkg;
|
||||
inherit version;
|
||||
inherit sha256;
|
||||
};
|
||||
}
|
||||
);
|
||||
in
|
||||
lib.fix pkg
|
||||
@@ -40,7 +40,6 @@ let
|
||||
rebar3Relx = callPackage ./rebar3-release.nix { };
|
||||
|
||||
buildRebar3 = callPackage ./build-rebar3.nix { };
|
||||
buildHex = callPackage ./build-hex.nix { };
|
||||
buildErlangMk = callPackage ./build-erlang-mk.nix { };
|
||||
buildMix = callPackage ./build-mix.nix { };
|
||||
fetchMixDeps = callPackage ./fetch-mix-deps.nix { };
|
||||
@@ -91,7 +90,7 @@ let
|
||||
|
||||
elixir-ls = callPackage ./elixir-ls { inherit elixir; };
|
||||
|
||||
lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 buildHex; };
|
||||
lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 fetchHex; };
|
||||
|
||||
livebook = callPackage ./livebook { inherit beamPackages; };
|
||||
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
{ lib, buildHex }:
|
||||
{
|
||||
lib,
|
||||
fetchHex,
|
||||
buildRebar3,
|
||||
}:
|
||||
|
||||
buildHex {
|
||||
buildRebar3 rec {
|
||||
name = "pc";
|
||||
version = "1.15.0";
|
||||
sha256 = "sha256-TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM=";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = name;
|
||||
inherit version;
|
||||
sha256 = "sha256-TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Rebar3 port compiler for native code";
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
{ lib, buildHex }:
|
||||
{
|
||||
lib,
|
||||
buildRebar3,
|
||||
fetchHex,
|
||||
}:
|
||||
|
||||
buildHex {
|
||||
buildRebar3 rec {
|
||||
name = "rebar3_proper";
|
||||
version = "0.12.1";
|
||||
sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = name;
|
||||
inherit version;
|
||||
sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "rebar3 proper plugin";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
bash,
|
||||
buildHex,
|
||||
fetchHex,
|
||||
buildRebar3,
|
||||
config,
|
||||
coreutils,
|
||||
@@ -26,11 +26,15 @@ let
|
||||
mainVersion = versions.major (getVersion erlang);
|
||||
maxAssert = versionAtLeast maximumOTPVersion mainVersion;
|
||||
|
||||
proper = buildHex {
|
||||
proper = buildRebar3 rec {
|
||||
name = "proper";
|
||||
version = "1.4.0";
|
||||
|
||||
sha256 = "sha256-GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=";
|
||||
src = fetchHex {
|
||||
pkg = name;
|
||||
inherit version;
|
||||
sha256 = "sha256-GChYQhhb0z772pfRNKXLWgiEOE2zYRn+4OPPpIhWjLs=";
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user