up
This commit is contained in:
@@ -14,7 +14,7 @@ let
|
|||||||
plugins = [
|
plugins = [
|
||||||
"github.com/caddy-dns/cloudflare@v0.2.2"
|
"github.com/caddy-dns/cloudflare@v0.2.2"
|
||||||
];
|
];
|
||||||
hash = "sha256-dnhEjopeA0UiI+XVYHYpsjcEI6Y1Hacbi28hVKYQURg=";
|
hash = "sha256-biQdtiscdmrwP6VUsuXmZrvcdewl+g50kdmab5lhE0s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# "github.com/hslatman/caddy-crowdsec-bouncer/http@v0.9.2"
|
# "github.com/hslatman/caddy-crowdsec-bouncer/http@v0.9.2"
|
||||||
|
|||||||
@@ -24,22 +24,25 @@
|
|||||||
installShellFiles,
|
installShellFiles,
|
||||||
fuseSupport ? false,
|
fuseSupport ? false,
|
||||||
udevCheckHook,
|
udevCheckHook,
|
||||||
|
namespace,
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
inherit (lib.trivial) importJSON;
|
||||||
|
inherit (lib.${namespace}) selectVariant mkAllSources;
|
||||||
|
|
||||||
|
versionSpec = importJSON ./version.json;
|
||||||
|
selected = selectVariant versionSpec null null;
|
||||||
|
sources = mkAllSources selected;
|
||||||
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "bcachefs-tools";
|
pname = "bcachefs-tools";
|
||||||
version = "1.36.1";
|
version = "1.36.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = sources.bcachefs-tools;
|
||||||
owner = "koverstreet";
|
|
||||||
repo = "bcachefs-tools";
|
|
||||||
tag = "v${finalAttrs.version}";
|
|
||||||
hash = "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM=";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
inherit (finalAttrs) src;
|
inherit (finalAttrs) src;
|
||||||
hash = "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY=";
|
hash = sources.cargoDeps.hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
16
packages/bcachefs/version.json
Normal file
16
packages/bcachefs/version.json
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"sources": {
|
||||||
|
"bcachefs-tools": {
|
||||||
|
"fetcher": "git",
|
||||||
|
"url": "https://github.com/koverstreet/bcachefs-tools",
|
||||||
|
"tag": "1.36.1",
|
||||||
|
"hash": "sha256-15Z1lHNeXTToDpdVc/YB5ojhoiB5qdgWs47O1aKoyFM=",
|
||||||
|
"cargoHash": "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY="
|
||||||
|
},
|
||||||
|
"cargoDeps": {
|
||||||
|
"hash": "sha256-YWsJUSgKNkK9W4Yuolix21bRRFSF01+sivoj7SJo7DY="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -13,7 +13,8 @@ buildHomeAssistantComponent rec {
|
|||||||
owner = owner;
|
owner = owner;
|
||||||
repo = "ha-bedjet";
|
repo = "ha-bedjet";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-Vs35OvIfSxvwiK6HenZWKOi7V8xz/RMWgplYxhQtvxU=";
|
hash = "sha256-sb6zC/kFtIMVr6+/U00jcFwOZxAedNutRONq/LZfdKI=";
|
||||||
|
tag = "2.0.1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with python3Packages; [
|
nativeBuildInputs = with python3Packages; [
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ buildHomeAssistantComponent rec {
|
|||||||
owner = owner;
|
owner = owner;
|
||||||
repo = "ha_gehome";
|
repo = "ha_gehome";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-hxgQsHb0E/XQEZoVFtKOgdHEVsU5UgqhOjjkgKqlI1I=";
|
hash = "sha256-p34yBtoqAMVCiAZKyxWPTVOSjPaueD1sb5ZEzWF2OZ4=";
|
||||||
|
tag = "v2026.2.0";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs =
|
||||||
|
|||||||
@@ -19,44 +19,44 @@
|
|||||||
"cachyos": {
|
"cachyos": {
|
||||||
"variables": {
|
"variables": {
|
||||||
"base": "10.0",
|
"base": "10.0",
|
||||||
"release": "20260207"
|
"release": "20260227"
|
||||||
},
|
},
|
||||||
"sources": {
|
"sources": {
|
||||||
"proton": {
|
"proton": {
|
||||||
"hash": "sha256-hJKrcrrMbVx1gakpVWYWg9ALjq+uAfYeB/67JfFliTg="
|
"hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cachyos-v2": {
|
"cachyos-v2": {
|
||||||
"variables": {
|
"variables": {
|
||||||
"base": "10.0",
|
"base": "10.0",
|
||||||
"release": "20260207"
|
"release": "20260227"
|
||||||
},
|
},
|
||||||
"sources": {
|
"sources": {
|
||||||
"proton": {
|
"proton": {
|
||||||
"hash": "sha256-mNUB/NXwTWDuP1PBVkENgMX8u53yzkP0dhQ8HnbUScs="
|
"hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cachyos-v3": {
|
"cachyos-v3": {
|
||||||
"variables": {
|
"variables": {
|
||||||
"base": "10.0",
|
"base": "10.0",
|
||||||
"release": "20260207"
|
"release": "20260227"
|
||||||
},
|
},
|
||||||
"sources": {
|
"sources": {
|
||||||
"proton": {
|
"proton": {
|
||||||
"hash": "sha256-76iQrZKa2ysCDKV4jysWqthaiKMfjGWQR7r6IwilktI="
|
"hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cachyos-v4": {
|
"cachyos-v4": {
|
||||||
"variables": {
|
"variables": {
|
||||||
"base": "10.0",
|
"base": "10.0",
|
||||||
"release": "20260207"
|
"release": "20260227"
|
||||||
},
|
},
|
||||||
"sources": {
|
"sources": {
|
||||||
"proton": {
|
"proton": {
|
||||||
"hash": "sha256-/GkMdSjP3DkbYjvvDEZvI2Na4WFW27zVwxkf9sLQj80="
|
"hash": "sha256-kcWSmF+qwClI4qUkv3ShVBQ6plQ8q3jyo59o5uN4ueM="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "python-roborock";
|
pname = "python-roborock";
|
||||||
version = "4.12.0";
|
version = "4.17.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = python3Packages.pythonOlder "3.11";
|
disabled = python3Packages.pythonOlder "3.11";
|
||||||
@@ -16,8 +16,8 @@ python3Packages.buildPythonPackage rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "humbertogontijo";
|
owner = "humbertogontijo";
|
||||||
repo = "python-roborock";
|
repo = "python-roborock";
|
||||||
tag = "v${version}";
|
tag = "v4.17.2";
|
||||||
hash = "sha256-H47NKOGKUCJs9LolVcTg6R8W6Fuq+YWBgrwJUB08JVA=";
|
hash = "sha256-i2XVzhZP+qA0pAv1qcaxGlgvhcz4efELO9t4vylRGdw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "pyvesync";
|
pname = "pyvesync";
|
||||||
version = "3.4.0";
|
version = "3.4.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = python3Packages.pythonOlder "3.11";
|
disabled = python3Packages.pythonOlder "3.11";
|
||||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec {
|
|||||||
owner = "webdjoe";
|
owner = "webdjoe";
|
||||||
repo = "pyvesync";
|
repo = "pyvesync";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-G1Ov8xXIVkklxfLqhHiYbRgHEsjTQhG7k1V6Amtc+w4=";
|
hash = "sha256-iqOKBpP/TYgbs6Tq+eWhxBCu/bHYRELXY7r4zjEXU3Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python3Packages; [ setuptools ];
|
build-system = with python3Packages; [ setuptools ];
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
"fetcher": "github",
|
"fetcher": "github",
|
||||||
"owner": "raspberrypi",
|
"owner": "raspberrypi",
|
||||||
"repo": "linux",
|
"repo": "linux",
|
||||||
"rev": "87e52a7868888c66b2782c949c8406c27f909c11",
|
"rev": "061ed5b31ad6f3136e6094002204040cd9c1c4a3",
|
||||||
"hash": "sha256-1ob91gGajlTEZjn7GRls4bL5TP8Ulj74hoRUUlmeICA="
|
"hash": "sha256-1ob91gasjlTEZjn7GRls4bL5TP8Ulj74hoRUUlmeICA="
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"variants": {
|
"variants": {
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"variables": {
|
"variables": {
|
||||||
"modDirVersion": "6.18.10"
|
"modDirVersion": "7.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
"fetcher": "github",
|
"fetcher": "github",
|
||||||
"owner": "raspberrypi",
|
"owner": "raspberrypi",
|
||||||
"repo": "utils",
|
"repo": "utils",
|
||||||
"rev": "58d5da926965ad78fb863abacdd73a00dea022a1",
|
"rev": "60ea0df9b7a43b4198c0def6355b600eb2cfbfb1",
|
||||||
"hash": "sha256-EjJMuqyJopZ+CsGrFwyjpOGx/p5+gww7IaIX0ZqlczU="
|
"hash": "sha256-P+SFkWcvNefpp1ZDf3GVMKuGG45POAWUeDKBvdMEAd0="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation {
|
|||||||
pname = "raspberrypi-firmware";
|
pname = "raspberrypi-firmware";
|
||||||
version = vars.version;
|
version = vars.version;
|
||||||
|
|
||||||
src = sources.firmware;
|
src = sources.firmware-next;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/raspberrypi/
|
mkdir -p $out/share/raspberrypi/
|
||||||
|
|||||||
@@ -10,6 +10,13 @@
|
|||||||
"repo": "firmware",
|
"repo": "firmware",
|
||||||
"tag": "${version}",
|
"tag": "${version}",
|
||||||
"hash": "sha256-DqVgsPhppxCsZ+H6S7XY5bBoRhOgPipKibDwikqBk08="
|
"hash": "sha256-DqVgsPhppxCsZ+H6S7XY5bBoRhOgPipKibDwikqBk08="
|
||||||
|
},
|
||||||
|
"firmware-next": {
|
||||||
|
"fetcher": "github",
|
||||||
|
"owner": "raspberrypi",
|
||||||
|
"repo": "firmware",
|
||||||
|
"rev": "94a0176136cbb024858cf8debd547f3f233021b7",
|
||||||
|
"hash": "sha256-DqVgsPhppxssZ+H6S7XY5bBoRhOgPipKibDwikqBk08="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user