Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot] 2026-05-23 12:22:43 +00:00 committed by GitHub
commit db72d619cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
67 changed files with 989 additions and 345 deletions

View file

@ -19,6 +19,7 @@ let
in
''
# Can't use -u (unset) because api.sh uses API_URL before it is set
set +u
set -eo pipefail
pihole="${lib.getExe pihole}"
jq="${lib.getExe pkgs.jq}"
@ -29,22 +30,24 @@ in
if [ ! -f '${cfg.settings.files.gravity}' ]; then
$pihole -g
# Send SIGRTMIN to FTL, which makes it reload the database, opening the newly created one
${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN $(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})
${lib.getExe' pkgs.procps "kill"} -s SIGRTMIN "$(systemctl show --property MainPID --value ${config.systemd.services.pihole-ftl.name})"
fi
# shellcheck disable=SC1091
source ${pihole}/share/pihole/advanced/Scripts/api.sh
# shellcheck disable=SC1091
source ${pihole}/share/pihole/advanced/Scripts/utils.sh
any_failed=0
addList() {
local payload="$1"
local payload="$1" result type error
echo "Adding list: $payload"
local type=$($jq -r '.type' <<< "$payload")
local result=$(PostFTLData "lists?type=$type" "$payload")
type=$($jq -r '.type' <<< "$payload")
result=$(PostFTLData "lists?type=$type" "$payload")
local error="$($jq '.error' <<< "$result")"
error="$($jq '.error' <<< "$result")"
if [[ "$error" != "null" ]]; then
echo "Error: $error"
any_failed=1
@ -62,7 +65,7 @@ in
echo "Added list ID $id: $result"
}
for i in 1 2 3; do
for _ in 1 2 3; do
(TestAPIAvailability) && break
echo "Retrying API shortly..."
${lib.getExe' pkgs.coreutils "sleep"} .5s

View file

@ -491,11 +491,18 @@ in
users.groups.${cfg.group} = { };
environment.etc."pihole/pihole.toml" = {
source = settingsFile;
user = cfg.user;
group = cfg.group;
mode = "400";
environment.etc = {
"pihole/pihole.toml" = {
source = settingsFile;
user = cfg.user;
group = cfg.group;
mode = "400";
};
"pihole/versions".text = ''
CORE_VERSION=${cfg.piholePackage.src.src.tag}
FTL_VERSION=${cfg.package.src.tag}
'';
};
environment.systemPackages = [ cfg.pihole ];

View file

@ -89,6 +89,8 @@ in
};
config = lib.mkIf cfg.enable {
environment.etc."pihole/versions".text = "WEB_VERSION=${cfg.package.src.tag}";
services.pihole-ftl.settings.webserver = {
domain = cfg.hostName;
port = cfg.ports;

View file

@ -21,20 +21,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.tar.gz";
hash = "sha256-6S0+ASWF7du0tHyfLu/6ZmxymP79m3bwxOxQTFfsoJs=";
url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.tar.gz";
hash = "sha256-Q3LOhpwpU6vrPWEzA+s2ZnbRxo+EeodBUHUYs3Xikrs=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.tar.gz";
hash = "sha256-niaHFXxXPh1iH26aAmHES2F/xbfkPJ18erDXFZign+g=";
url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.tar.gz";
hash = "sha256-YM105ozP78oLDmwKL0t4Z4wGjCDh6xvhf/C1oCD6Qi8=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.dmg";
hash = "sha256-LWbFIC2xhh2Co2/BOTvScGWL9Qs77WAM4A+gxtuA4B4=";
url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.dmg";
hash = "sha256-UEkYDJBjRvvUUB2UFsc37kdp/i+1ctqULSKs62/t9/I=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.dmg";
hash = "sha256-8m6SbpkVdQ9QZykVlse9cK8KysXlPn/NA9WysLHh8jk=";
url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.dmg";
hash = "sha256-scMwDF+mIfx/66cBrvdxp+gU3+qA2sUWqoGCEhPItjE=";
};
};
# update-script-end: urls
@ -48,8 +48,8 @@ in
product = "CLion";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.135";
version = "2026.1.2";
buildNumber = "261.24374.148";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -12,20 +12,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.tar.gz";
hash = "sha256-hXQIvnyjosH3uEUpi43NJYnk8cMXVVlKblpiGeVlekk=";
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.tar.gz";
hash = "sha256-9NEHD9FXekwjRHTrPMeK4xU4sHnXPge+wRXyCFMmPBk=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.tar.gz";
hash = "sha256-nsF/Oo0p+hXqSehIhrPc7i0zURDXgtf/rBpMFKgq+7c=";
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.tar.gz";
hash = "sha256-M7XiLlIl7JFKbARb9Zli0c3cHUo2X0nPVrGhs3pK2bQ=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.dmg";
hash = "sha256-1pqtAR8r2ZwU/RhFMDsyFBhhRYvsPrT5F/n3kSP2viA=";
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2.dmg";
hash = "sha256-Wuuj6/K/5xoM9+d59IGzBo19iOJusbIMigoflPLQ+ts=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.dmg";
hash = "sha256-orFAOXR9A/0S7lhwkD9bAXyp24HaDSlXe/rL4iT6+80=";
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.2-aarch64.dmg";
hash = "sha256-ADWFPMC4ptj2mZk4RJgtIQjOT2xwOkL67UahoKte6mQ=";
};
};
# update-script-end: urls
@ -40,8 +40,8 @@ mkJetBrainsProduct {
productShort = "Gateway";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.152";
version = "2026.1.2";
buildNumber = "261.24374.120";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -12,20 +12,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/go/goland-2026.1.1.tar.gz";
hash = "sha256-ASzqw8xuRaSAwzoiBsL+6PRyuSvBh43tnF4mEmkur9s=";
url = "https://download.jetbrains.com/go/goland-2026.1.2.tar.gz";
hash = "sha256-1FkDEaapyDbTPe4soOdyCHLkp/UT3rZ6siGyGyjmGJo=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.tar.gz";
hash = "sha256-25PADBycdas3n6BWSGOJhuMaLcik5P5AfcEO6mY75js=";
url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.tar.gz";
hash = "sha256-E8WpA4s/ePEDAs47IPC0v10C1VKl9UYU7VNX/5igpm4=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/go/goland-2026.1.1.dmg";
hash = "sha256-kKr5/7z5gbL0YORDET0y7LgczWLEQ31lqsrHgkxrzQ8=";
url = "https://download.jetbrains.com/go/goland-2026.1.2.dmg";
hash = "sha256-iWYTMImwzMh9KSJgek8a84o/KlLWBaOj80vKlB8Ftes=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.dmg";
hash = "sha256-zfdJrXBatvAl3wNMQ3LhF9oOxo1dEyo8wr4lCoFdm9I=";
url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.dmg";
hash = "sha256-TFnEMq7u51UvtaOjnxS+abJhsR3aSnaQjNFfF8EQrcQ=";
};
};
# update-script-end: urls
@ -39,8 +39,8 @@ in
product = "Goland";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.143";
version = "2026.1.2";
buildNumber = "261.24374.154";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -12,20 +12,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.tar.gz";
hash = "sha256-TOSiFAphV/JYrUg9tB/BAtAGjn6P0DpaYHO2W3FcCGQ=";
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.tar.gz";
hash = "sha256-VbXsfKahp1X4AwAC10VghE+ZkxThovnYHHYyvkOTtFc=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.tar.gz";
hash = "sha256-fWguwgUQstCytAMKam4scziEeyOxVEhIxS1O81HO/yI=";
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.tar.gz";
hash = "sha256-f0Owuq0OjVwnp4Gj/diiPFn9F1Hf4gm/MwHzkabIH2w=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.dmg";
hash = "sha256-W28NwTNZe3Vj19J32nY8Jrn2rFVVd+0H2NWzDCTG8nw=";
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2.dmg";
hash = "sha256-XzYv58bR8ts6MTREUjqQinCzHvTdrLVEDH5vg1vQ3so=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.dmg";
hash = "sha256-tm/UFH/5FX0HQ/FnjQ/Jwwaf/cpIYb4j0NvKlazBp08=";
url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.2-aarch64.dmg";
hash = "sha256-dJOqdY+D5FssDAvocMOXk9O22qk+QLxwDm2MHK2Wggg=";
};
};
# update-script-end: urls
@ -39,8 +39,8 @@ mkJetBrainsProduct {
product = "PhpStorm";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.149";
version = "2026.1.2";
buildNumber = "261.24374.185";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -24,20 +24,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.tar.gz";
hash = "sha256-moIysTTsq7abpQfNh1Bc5Pk6VQgJIT6erbyHsUXf15Y=";
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.tar.gz";
hash = "sha256-OmysaGXGMxxAAa2qrHvX8yXIwJLU7tKG8/EBGhr55EA=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.tar.gz";
hash = "sha256-0gEmWObwCio3aBqmUh2u5adWO3fFJV8uFwUTT31KsMI=";
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.tar.gz";
hash = "sha256-xcwd4OgobMXFQ2W+SN6O5I3mud4kedVQ/0rZBWbXIGY=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.dmg";
hash = "sha256-s/lppcf2gfwmFYeHjWtk2NGPAjo/PAEnaGNWhDOkKOM=";
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.dmg";
hash = "sha256-uoOP+EYB11M99MlAFF7efZSKmCk0fwjCImFiasUQPUw=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.dmg";
hash = "sha256-BHHrO4DLfw4cdbrJCH1uqX2qdm/ijyFnj32WQ8rpVhI=";
url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.dmg";
hash = "sha256-Mo6gxWatX6wlL3s8Li19F58cnKZtOtFUfNyGPrC6CtA=";
};
};
# update-script-end: urls
@ -51,8 +51,8 @@ in
product = "Rider";
# update-script-start: version
version = "2026.1.0.1";
buildNumber = "261.22158.394";
version = "2026.1.2";
buildNumber = "261.24374.190";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -12,20 +12,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.tar.gz";
hash = "sha256-tdT8LwsHGC5jUxGsRPVw1VfKfKZ05gZsGL6kpsxcPFA=";
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.tar.gz";
hash = "sha256-6rvtK1TsZsuuVqfya9eh7fHk7LJyyxg4SYrU/yXnK1I=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.tar.gz";
hash = "sha256-ns9oxsMXSPJS5KWSX0oKOyOyg8bguUnd8v1TRwV9EXw=";
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.tar.gz";
hash = "sha256-EvKpY3zbUHT03GVIT/HJxVkOtJgsCG+jYNcKfiX0mTI=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.dmg";
hash = "sha256-Q/W6Pe3o6qwdHQm2z4bnenyEe7DrWwnov3M+JL8bS0o=";
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2.dmg";
hash = "sha256-KWbysSPVHM0BS09rntD78i8BuP3v26zha8GatFMZtg0=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.dmg";
hash = "sha256-UPnESouBCx59e2n8inTfe+zSCkQMF2XeoNw825LTKuU=";
url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.2-aarch64.dmg";
hash = "sha256-NEmps3wxao9cb2wgbmIndXPs78Tmona4wC9+8DBv7cI=";
};
};
# update-script-end: urls
@ -39,8 +39,8 @@ mkJetBrainsProduct {
product = "RubyMine";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.142";
version = "2026.1.2";
buildNumber = "261.24374.145";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -18,20 +18,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.tar.gz";
hash = "sha256-UYljm43s/UOEvk0Peio2Crsdx0K5U5Seo57M34A1A1c=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.tar.gz";
hash = "sha256-INIz7nGar/oHh+CHfz4jm5t9/ARPcMfpnOl99Z3kg3I=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.tar.gz";
hash = "sha256-FUDCF4pOtovjBKaNV0dEjc5PwsDLBXTTHnc3+oNDU7A=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.tar.gz";
hash = "sha256-PmCDYM8nqySQm6cpUJQ9PyzSkKOR6V3LuXnYpE0i7fU=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.dmg";
hash = "sha256-DxrFdxSLiyH7/davL4QeAPxlKK3IA5JXzPetTYaMtck=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.dmg";
hash = "sha256-HI2qt6wTddANqdRuKQ4X7mXQyBA4dJYz9ewfI2iAYfw=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.dmg";
hash = "sha256-K9Gwkudx+WV25fA1IRwfDlqcK8X0I/SzrL7S2iG7IfI=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.dmg";
hash = "sha256-JMg/vs3aVeHmr6tiZZTggRGpH9O6lKlyeP8Ot4mm24w=";
};
};
# update-script-end: urls
@ -45,8 +45,8 @@ in
product = "RustRover";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.140";
version = "2026.1.2";
buildNumber = "261.24374.182";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -12,20 +12,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.tar.gz";
hash = "sha256-r9XetjreFB6qU7VQbHsFLn7boKhZylfyGsfPNumFQZw=";
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2.tar.gz";
hash = "sha256-xoMOLYSuWqWUh5RLI1Q4OnAgGM6tqRDWd1VoULX17yE=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.tar.gz";
hash = "sha256-Damq3svwCOrE+fTBBVY8vi/1vtFJFFqFsSWQhY9L/x4=";
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2-aarch64.tar.gz";
hash = "sha256-Qe9yclQj971jK8V2SL5GAlNpgUfTwP/PS2ILv2LyhuE=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.dmg";
hash = "sha256-+s6MjE4zD4YZxnYRqsaXVthTWNnCn1HS3K7Ik+lb2cI=";
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2.dmg";
hash = "sha256-DmsOaBjKnhbipSrIfbTqNd9+qcd2i3zkKfVvLK1GXbI=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.dmg";
hash = "sha256-/WwGXnvYZz8MzOOQgf4BGMRP7cLIv8FA1lK8NvIgtoo=";
url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.2-aarch64.dmg";
hash = "sha256-2YyCHi7yPXnq5KWkqC+Uodnc4xj+DkTsL1vUNqLNmPg=";
};
};
# update-script-end: urls
@ -39,8 +39,8 @@ mkJetBrainsProduct {
product = "WebStorm";
# update-script-start: version
version = "2026.1.1";
buildNumber = "261.23567.141";
version = "2026.1.2";
buildNumber = "261.24374.125";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -65,7 +65,7 @@ class VersionFetcher:
new_build_number = build["@number"]
else:
new_build_number = build["@fullNumber"]
if "EAP" not in channel["@name"]:
if "EAP" not in channel["@id"]:
version_or_build_number = new_version
else:
version_or_build_number = new_build_number
@ -111,7 +111,7 @@ class VersionFetcher:
root = xmltodict.parse(updates_response.text)
products = root["products"]["product"]
return {
channel["@name"]: channel
channel["@id"]: channel
for product in products
if "channel" in product
for channel in one_or_more(product["channel"])

View file

@ -1,6 +1,6 @@
{
"clion": {
"channel": "CLion RELEASE",
"channel": "CL-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
@ -9,7 +9,7 @@
}
},
"datagrip": {
"channel": "DataGrip RELEASE",
"channel": "DB-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
@ -18,7 +18,7 @@
}
},
"dataspell": {
"channel": "DataSpell RELEASE",
"channel": "DS-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
@ -27,7 +27,7 @@
}
},
"gateway": {
"channel": "Gateway RELEASE",
"channel": "GW-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
@ -36,7 +36,7 @@
}
},
"goland": {
"channel": "GoLand RELEASE",
"channel": "GO-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
@ -45,7 +45,7 @@
}
},
"idea": {
"channel": "IntelliJ IDEA RELEASE",
"channel": "IU-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
@ -54,11 +54,11 @@
}
},
"idea-oss": {
"channel": "IntelliJ IDEA RELEASE",
"channel": "IU-RELEASE-licensing-RELEASE",
"urls": {}
},
"mps": {
"channel": "MPS RELEASE",
"channel": "MPS-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
@ -67,7 +67,7 @@
}
},
"phpstorm": {
"channel": "PhpStorm RELEASE",
"channel": "PS-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
@ -76,7 +76,7 @@
}
},
"pycharm": {
"channel": "PyCharm RELEASE",
"channel": "PY-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz",
@ -85,11 +85,11 @@
}
},
"pycharm-oss": {
"channel": "PyCharm RELEASE",
"channel": "PY-RELEASE-licensing-RELEASE",
"urls": {}
},
"rider": {
"channel": "Rider RELEASE",
"channel": "RD-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
@ -98,7 +98,7 @@
}
},
"ruby-mine": {
"channel": "RubyMine RELEASE",
"channel": "RM-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
@ -107,7 +107,7 @@
}
},
"rust-rover": {
"channel": "RustRover RELEASE",
"channel": "RR-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
@ -116,7 +116,7 @@
}
},
"webstorm": {
"channel": "WebStorm RELEASE",
"channel": "WS-RELEASE-licensing-RELEASE",
"urls": {
"x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",

View file

@ -12,13 +12,13 @@
}:
mkLibretroCore {
core = "mupen64plus-next";
version = "0-unstable-2026-05-12";
version = "0-unstable-2026-05-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "mupen64plus-libretro-nx";
rev = "8cdfadf266a784cd1849f7fef8adae2912240b18";
hash = "sha256-37A9ScN8jRX1i2aocyNr3VAJsJ7xoMsmzVgPILpoqmQ=";
rev = "98c1b0d877542b01314b3b04272282ba223b65b3";
hash = "sha256-ardO7zuuG4rqm2d88IduMs3CVYNHiHyaxQ5ZDtbMVHU=";
};
# Fix for GCC 14

View file

@ -34,6 +34,10 @@ clangStdenv.mkDerivation (finalAttrs: {
];
strictDeps = true;
cmakeFlags = [
(lib.cmakeFeature "BUILD_TV" "1")
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail '-Werror' "" \
@ -55,6 +59,7 @@ clangStdenv.mkDerivation (finalAttrs: {
mkdir -p $out/bin
cp alive $out/bin/
cp alive-jobserver $out/bin/
cp alive-tv $out/bin/
rm -rf $out/bin/CMakeFiles $out/bin/*.o
runHook postInstall
'';

View file

@ -10,14 +10,14 @@
buildGo126Module (finalAttrs: {
pname = "athens";
version = "0.17.0";
version = "0.17.1";
src = applyPatches {
src = fetchFromGitHub {
owner = "gomods";
repo = "athens";
tag = "v${finalAttrs.version}";
hash = "sha256-4KCPYqLtqz46zr5+LB4CyG4ZQrjQaPgMEhCuGOWIJKg=";
hash = "sha256-hNk0hW7R7HdE4Wt1KuKSIUarRGKbtbFqQbfls1HXTqI=";
};
# Trim the patch version, not needed anyway.
postPatch = ''

View file

@ -33,14 +33,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "atril";
version = "1.28.4";
version = "1.28.5";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "atril";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-0BrD897SRf26A4Z1wdizfwoVEEQ7c7EEhAV4vmkBc8E=";
hash = "sha256-iG+FFvxxL2/6HqGchoaIDqx8Gfo1wxqM4GW66ScZlao=";
};
nativeBuildInputs = [

View file

@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "bark-server";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "Finb";
repo = "bark-server";
tag = "v${finalAttrs.version}";
hash = "sha256-ANOGAzm+25WUoRMGE5b70uKE4EhlGkuC4QWvpa2K7Uo=";
hash = "sha256-s02nLAlKO5SGX0Nx5z/5fZBf6R0kkY4IofbGW8ica50=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-yStMk1U6FmF2Ldqnm5HKsu6Pn3xjm5pGLMWAGyYxb2c=";
vendorHash = "sha256-+WyTKyWVzJAgCQ6bXbOjrJUZkw5XVrvAdgALL2eXU64=";
ldflags = [
"-s"

View file

@ -8,13 +8,13 @@
buildNpmPackage rec {
pname = "better-commits";
version = "1.23.0";
version = "1.23.1";
src = fetchFromGitHub {
owner = "Everduin94";
repo = "better-commits";
tag = "v${version}";
hash = "sha256-d2e+vA8qPr5H70X6caeW+s4yjI1zGByvmZd50j2nAQI=";
hash = "sha256-4ixxgpqyjU1juU200Dc0YTSC+bvVYHpqzylCR3Yy+Yk=";
};
npmDepsHash = "sha256-18fkqQ3Y0fflSGXDPaMpHW7nC0ARMoCStxBzkEXiujs=";

View file

@ -7,20 +7,20 @@
buildGoModule (finalAttrs: {
pname = "butler";
version = "15.26.1";
version = "15.27.0";
src = fetchFromGitHub {
owner = "itchio";
repo = "butler";
tag = "v${finalAttrs.version}";
hash = "sha256-/Sdk9uYWjYtJFvc/xmrewgHlC+6cpqPoUP22xIfowj8=";
hash = "sha256-AnyZhfBjajWAM/pzCQjHOjY3sOQzU20y+LWHBZxbU3Y=";
};
buildInputs = [ brotli ];
doCheck = false; # disabled because the tests don't work in a non-FHS compliant environment.
vendorHash = "sha256-8f4EVARMtdzXL3YxGimgLM/A7BF/GOaEoxffkQ1SlHw=";
vendorHash = "sha256-zDovN9J6IOE3TrXP60PPcsIc0PpXyEaqSR8i4i9MiHk=";
meta = {
description = "Command-line itch.io helper";

View file

@ -1,6 +1,6 @@
import ./generic.nix {
version = "26.4.2.10-stable";
rev = "184f682d431389803dd383668f52729cf26e23db";
hash = "sha256-UCRwnrIY/j0gdjFnNmR5U7VZeBRqA96mIt6AEKRJQ5Q=";
version = "26.5.1.882-stable";
rev = "5b96a8d8a5e2f4800b43a780911a39dc5a666e1c";
hash = "sha256-Z+xcmHIkCuYSqOFdWSRWk2BFuCeI9yXnJIntSa4zXUk=";
lts = false;
}

View file

@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "deja";
version = "0.2.5";
version = "0.2.6";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "Giammarco-Ferranti";
repo = "deja";
tag = "v${finalAttrs.version}";
hash = "sha256-0eRXPtm+L1C4/fc/WLn9p2LV8uhJ4w+40hhA69+CEdw=";
hash = "sha256-xxbClKhhSwo+jUjAZ2gS4yOS5sSI76dfPpDzA3qdV18=";
};
vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8=";

View file

@ -35,7 +35,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dnf5";
version = "5.4.1.0";
version = "5.4.2.1";
outputs = [
"out"
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "rpm-software-management";
repo = "dnf5";
tag = finalAttrs.version;
hash = "sha256-wvWOQyY7K9fCds2am8gYpjw9mPl7IbOdHT92b8pwonc=";
hash = "sha256-Z+k47LC3gaBQ3y3090MLsSvPKlwPUVrYEBboKhskTik=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "git-aggregator";
version = "4.1";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "acsone";
@ -17,11 +17,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
hash = "sha256-sZYh3CN15WTCQ59W24ERJdP48EJt571cbkswLQ3JL2g=";
};
nativeBuildInputs = with python3Packages; [
build-system = with python3Packages; [
setuptools-scm
];
propagatedBuildInputs = with python3Packages; [
dependencies = with python3Packages; [
argcomplete
colorama
gitMinimal

View file

@ -1,38 +1,39 @@
{
lib,
stdenv,
rustPlatform,
fetchurl,
fetchpatch,
wrapGAppsHook3,
wrapGAppsHook4,
meson,
vala,
pkg-config,
ninja,
itstool,
clutter-gtk,
libgee,
libgnome-games-support,
gnome,
gtk3,
gtk4,
libadwaita,
stdenv,
rustc,
cargo,
desktop-file-utils,
writableTmpDirAsHomeHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-twenty-forty-eight";
version = "3.38.2";
pname = "gnome-2048";
version = "50.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
hash = "sha256-4nNn9cCaATZYHTNfV5E6r1pfGA4ymcxcGjDYWD55rmg=";
url = "mirror://gnome/sources/gnome-2048/${lib.versions.major finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
hash = "sha256-bRXfaKYSjPDJnlmJCK+MZntzPcQAPvTSHUtMSkK9Lak=";
};
patches = [
# Fix build with meson 0.61
# https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-2048/-/commit/194e22699f7166a016cd39ba26dd719aeecfc868.patch";
hash = "sha256-Qpn/OJJwblRm5Pi453aU2HwbrNjsf+ftmSnns/5qZ9E=";
})
];
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-OcuhISJhm8uvcJjki86FSNiT5AoqUrILZaHcn1oZVtk=";
};
strictDeps = true;
__structuredArgs = true;
nativeBuildInputs = [
itstool
@ -40,16 +41,25 @@ stdenv.mkDerivation (finalAttrs: {
ninja
pkg-config
vala
wrapGAppsHook3
wrapGAppsHook4
rustPlatform.cargoSetupHook
rustc
cargo
desktop-file-utils
];
buildInputs = [
clutter-gtk
libgee
libgnome-games-support
gtk3
gtk4
libadwaita
];
nativeCheckInputs = [
writableTmpDirAsHomeHook
rustPlatform.cargoCheckHook
];
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-2048";

121
pkgs/by-name/ki/kiesel/deps.nix generated Normal file
View file

@ -0,0 +1,121 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{
linkFarm,
fetchzip,
fetchgit,
}:
linkFarm "zig-packages" [
{
name = "N-V-__8AAFP3MACLqx3IPYUe7MVJki-nUn2Jtimo4Tx6u2s_";
path = fetchgit {
url = "https://github.com/bellard/quickjs";
rev = "f1139494d18a2053630c5ed3384a42bb70db3c53";
hash = "sha256-XeDNFR3jbP/rY9zBqaiOaDTwKn7tuxHMiBK3qwAky4w=";
};
}
{
name = "N-V-__8AAMFkNQCMS3QG2Q2vrQ1urnQq0PqKINS-iRDs1Xqc";
path = fetchzip {
url = "https://musl.libc.org/releases/musl-1.2.6.tar.gz";
hash = "sha256-vcI36q0+leXQBuGms1Uf0IF6U4KLGmW3Yz2t7cpNw5k=";
};
}
{
name = "N-V-__8AAOysEw1hmwdD5wXRZ2cFnJPd2TRXwVpC--qXk-ot";
path = fetchgit {
url = "https://github.com/unicode-org/icu4x";
rev = "6f32890b737485e86b712777edb7001d2f31c9c8";
hash = "sha256-O9p1++FZmiCNGk55hvYe3iS/kdSXzR+1htWCq2tBgdw=";
};
}
{
name = "N-V-__8AAPLKOQDfJ5TYhiiy_6a_dZqUmo9K4e8Xhjfup3fd";
path = fetchgit {
url = "https://github.com/boa-dev/temporal";
tag = "v0.2.3";
hash = "sha256-wD4pTVgQZrGONgSTDm9Eq3fo3Ez7aIC0/n4Rqgksad4=";
};
}
{
name = "args-0.0.0-CiLiqmvgAADyJmrzcQTP9IOYNvTzR_KGrg3ZNNsH2Qv0";
path = fetchgit {
url = "https://github.com/ikskuh/zig-args";
rev = "d47ae21768f9ec47c2a4154ab48b87166965b820";
hash = "sha256-Gpl6GU74hNf3ZTg5v2ua3gajjPJRIrb2EIraDVQZBdw=";
};
}
{
name = "bdwgc-8.3.0-8obE-IejLwCX53s54D3b3nIqlsMLiZ0ZtAF8nMvffTtR";
path = fetchgit {
url = "https://github.com/bdwgc/bdwgc";
rev = "ea69934ed214cfb4e38d2a0176cc392af8055a83";
hash = "sha256-wippr/ilU5cf+2D6T+kXUDZC0r353wCYyad7Y0hQvdM=";
};
}
{
name = "bdwgc_zig-0.1.0-ffcEgVh8AAAhDLt3oykzvhRx_WDGdHCoqmswDTnmei6b";
path = fetchgit {
url = "https://github.com/bdwgc/bdwgc-zig";
rev = "1cfcd9ea8947e172f20b028fbc52e778632fa407";
hash = "sha256-bTjPgn44QAgWAjiLqP3S5CK9os7L1cex+TXgzKU2dHY=";
};
}
{
name = "build_crab-0.3.0-U0id_xWbAAD_ILwDslPuOn6XptkUzaGgJqRtO8aV_naN";
path = fetchgit {
url = "https://github.com/linusg/build.crab";
rev = "8592bb943546f1b08cdcb3a23701750737f40af5";
hash = "sha256-IMh1qxl6Fb+08oEgIR/93F5bKub8bkGXiNbjLNsbgYs=";
};
}
{
name = "icu4zig-0.1.0-IT7GrJalAgC00wqxu8c6JBs8A580wS-QrXBE7FJ1ZVaz";
path = fetchgit {
url = "https://codeberg.org/linus/icu4zig";
rev = "13caca132022c0acd9a0c04356ebf7d758340b8a";
hash = "sha256-fz1YnPDDEIJVxlmxUfYq3ydksu739cT6aNK5W9N1RbA=";
};
}
{
name = "known_folders-0.0.0-Fy-PJsbKAACbDh9bBxR0MMThxZSS6A9RH4apWphNHY70";
path = fetchgit {
url = "https://github.com/ziglibs/known-folders";
rev = "207c34a16e4365edc20d92c7892f962b3bed46e8";
hash = "sha256-9hMnEc3ktnFTZT28hjaOkafjSUXEI+SNIO9GMcJrBfA=";
};
}
{
name = "parser_toolkit-0.1.0-baYGPdpDEwBQQ2__YEalqGB09TAjP7vpoe2DFkwg6mRa";
path = fetchgit {
url = "https://github.com/ikskuh/parser-toolkit";
rev = "cc3977376a7bf0eb6f203ae5c00e8cea6f9d6600";
hash = "sha256-6mYFtGenWWQoLFg/VJZRMmCY2xyt/ntGqd+DvhDjqXE=";
};
}
{
name = "stackinfo-0.1.0-NZ2qTk8iAAC6y9NJVJ55kzDGmuGMoqGhlmHiG1baZKi3";
path = fetchgit {
url = "https://codeberg.org/linus/zig-stackinfo";
rev = "08bc113a9f8e85689ef536b6e5516c658bf4703e";
hash = "sha256-2BwpJUtI9OHjuiO0h/pOORieV4QgaT7iJ2kCniin6Kg=";
};
}
{
name = "unicode_id-0.0.1-u-LDL5CDAQArdOvYpoHk9jOi8A9QbZwUD0JB3CjZ7i6O";
path = fetchgit {
url = "https://codeberg.org/linus/unicode-id";
rev = "107488ed2dea04ef30a79538ded406d84a164901";
hash = "sha256-JHt7PUP/onrb797ufYC36AH4255/EjNUvUY6Hjk4pT4=";
};
}
{
name = "zigline-0.1.0-6llsB4uJAgAP1Yhp3ewmtwUXbg9RjHoc9Arl-i27NGWT";
path = fetchgit {
url = "https://github.com/alimpfard/zigline";
rev = "c0e5fc200b35ec177167f6dac1bb923b8a1478c5";
hash = "sha256-+C/z2h5FwnOGkr0WsAzSLQeqowUAQmIrKZGt/G/YrKw=";
};
}
]

View file

@ -0,0 +1,58 @@
{
callPackage,
cargo,
fetchFromCodeberg,
lib,
nix-update-script,
rustc,
rustPlatform,
stdenv,
zig_0_16,
}:
let
zig = zig_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "kiesel";
version = "0.2.0";
src = fetchFromCodeberg {
owner = "kiesel-js";
repo = "kiesel";
tag = finalAttrs.version;
hash = "sha256-bddGd3LPmVV8wwoVHYJJKoHS6ssYyU1hQBTGJBQJPgc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
src = "${finalAttrs.src}/pkg/zement";
hash = "sha256-SOp8UW0iKniXwzEGGtzX5rFAdVQKDHoEvCupquusvmo=";
};
cargoRoot = "pkg/zement";
deps = callPackage ./deps.nix { };
strictDeps = true;
nativeBuildInputs = [
cargo
rustc
rustPlatform.cargoSetupHook
zig.hook
];
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
];
__structuredAttrs = true;
passthru.tests.run = callPackage ./test.nix { kiesel = finalAttrs.finalPackage; };
passthru.updateScript = nix-update-script { };
meta = {
description = "JavaScript engine written in Zig";
license = lib.licenses.mit;
homepage = "https://kiesel.dev";
maintainers = with lib.maintainers; [ cvengler ];
platforms = lib.platforms.all;
mainProgram = "kiesel";
};
})

View file

@ -0,0 +1,12 @@
{ runCommand, kiesel }:
runCommand "kiesel-test-run"
{
nativeBuildInputs = [ kiesel ];
}
''
export NO_COLOR=1
GOT=$(kiesel -p -c 'Array(16).join("wat" - 1) + " Batman!"')
EXPECT='"NaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaNNaN Batman!"'
test "$EXPECT" = "$GOT"
touch $out
''

View file

@ -1,7 +1,9 @@
{
lib,
stdenv,
fetchurl,
fetchFromGitHub,
autoconf-archive,
autoreconfHook,
pkg-config,
gettext,
gtk3,
@ -9,6 +11,7 @@
libxscrnsaver,
libnotify,
libxml2,
mate-common,
mate-desktop,
mate-menus,
mate-panel,
@ -20,17 +23,22 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mate-screensaver";
version = "1.28.0";
version = "1.28.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-screensaver-${finalAttrs.version}.tar.xz";
sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA=";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-screensaver";
tag = "v${finalAttrs.version}";
hash = "sha256-MTu5W+JBBlFzsv/IbygaE3+i7Df1YRGGoeZNSSSwbXM=";
};
nativeBuildInputs = [
autoconf-archive
autoreconfHook
pkg-config
gettext
libxml2 # provides xmllint
mate-common # mate-common.m4 macros
wrapGAppsHook3
];
@ -53,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-screensaver";
odd-unstable = true;
rev-prefix = "v";
};

View file

@ -14,19 +14,19 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.152.1";
version = "1.153.0";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-81nqT6/TuqtQjjqnT6O+72WCCPlZ9JJKbWczMh6mbcU=";
hash = "sha256-2/KzRPUMfOOmI8j8WZsVU2ubNxidTb+FW0MZF+ktSSQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-RwUsiS6JM5dmqquKVtyaBp67DYZys6Uecy0V6AabTk4=";
hash = "sha256-Cu5bXS6BprXr/dwkNXDjcP9hOfqQddoC5BxOus4rteM=";
};
build-system =

View file

@ -25,10 +25,10 @@
#
# Ensure you also check ../mattermostLatest/package.nix.
regex = "^v(11\\.7\\.[0-9]+)$";
version = "11.7.0";
srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg=";
vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4=";
npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc=";
version = "11.7.1";
srcHash = "sha256-9eI9tX6qHEEzm7aro7ky2JORfAmqbjmrmxABFVTZzW8=";
vendorHash = "sha256-xu399pAtIJUIns+GhKFlDR0crWV+8HiN9Wf38EMu5q8=";
npmDepsHash = "sha256-M+yoCLR4yT30n3rhqZu1z8zeWas+5VniP4aaIJPz6VU=";
},
...
}:

View file

@ -9,16 +9,16 @@
buildGoModule {
pname = "mkuimage";
version = "0-unstable-2025-09-05";
version = "0-unstable-2026-04-13";
src = fetchFromGitHub {
owner = "u-root";
repo = "mkuimage";
rev = "9a40452f5d3ba67f236a83de54fa2c40f797b68b";
hash = "sha256-asC4j2DXkQnx6BZntxA8hSaM2k6p0CxraHYq3bK9vNQ=";
rev = "72394cd98f39c9190dcc4f2a601902d43af1ae6e";
hash = "sha256-0XY2oTwdKEFVbOMTnxoKoM9OoJm9Y+R/3z04VZwk2T8=";
};
vendorHash = "sha256-KX9uv5m4N4+7gOgjhotRac9sz8tWSJ1krq98RWdsbzg=";
vendorHash = "sha256-PmfHdl0GG84kPPUgKiLwhKvcgbbwJLFMnX1cI//U5T8=";
subPackages = [
"cmd/gentpldeps"
@ -53,6 +53,5 @@ buildGoModule {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ katexochen ];
mainProgram = "mkuimage";
broken = true;
};
}

View file

@ -8,14 +8,14 @@
}:
buildLua (finalAttrs: {
pname = "modernz";
version = "0.3.2";
version = "0.3.3";
scriptPath = "modernz.lua";
src = fetchFromGitHub {
owner = "Samillion";
repo = "ModernZ";
rev = "v${finalAttrs.version}";
hash = "sha256-HUbS5L0kuYYm9HZ0BEzsqFQii3PQlZtzPiVRF/rDbcY=";
hash = "sha256-cz6yb0jQiqmzRPo1YSsnPWLshGPzBeq39DhBv7tGJqs=";
};
nativeBuildInputs = [ installFonts ];

View file

@ -2,30 +2,30 @@
lib,
stdenv,
buildNpmPackage,
electron_39,
electron_42,
fetchFromGitHub,
jq,
makeDesktopItem,
}:
let
electron = electron_39;
electron = electron_42;
description = "Visualizer for neural network, deep learning and machine learning models";
icon = "netron";
in
buildNpmPackage (finalAttrs: {
pname = "netron";
version = "8.8.2";
version = "9.0.8";
src = fetchFromGitHub {
owner = "lutzroeder";
repo = "netron";
tag = "v${finalAttrs.version}";
hash = "sha256-DeI82vixVJwAfYYUOTTZCeRTYvmkAutuQQm1fCdj8fs=";
hash = "sha256-vWzifB8A0VzzSkPVrcFtrR/tLBeFh1n+xwefhNo4PDQ=";
};
npmDepsHash = "sha256-HyqfrkO9Cbo6KVY1QuA4i6od6M7ZQaIfkUWA2P/bvfI=";
npmDepsHash = "sha256-3Vaoym7o3sTmEHTNTG90i/NgdJ2x+skJ1slpp0dmv64=";
nativeBuildInputs = [ jq ];

View file

@ -32,11 +32,7 @@ let
npmDepsHash = "sha256-kAUbFAFNo5RHMGqO7sPHSxSEZw9Ky6Pxp/vddDyw90E=";
# See https://github.com/open-webui/open-webui/issues/15880
npmFlags = [
"--force"
"--legacy-peer-deps"
];
npmFlags = [ "--force" ];
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.

View file

@ -12,16 +12,16 @@
}:
buildNpmPackage (finalAttrs: {
pname = "pi-coding-agent";
version = "0.75.3";
version = "0.75.4";
src = fetchFromGitHub {
owner = "earendil-works";
repo = "pi";
tag = "v${finalAttrs.version}";
hash = "sha256-c/+cxkp/EZ2PLERxTENN5edXHEs7M2oqzNepjRA4TIE=";
hash = "sha256-zyIgs2N7uVz+7E+NqxH78baRw0OwXvlrjZiDIP/v0M4=";
};
npmDepsHash = "sha256-/mWjrZFzRmtkbWYMJOXKnLPxFITFndq5hgdY0DnPfAg=";
npmDepsHash = "sha256-5Vl+0BBUS7Rtb6XqpGKbbNMyh+9UX2aAsgtn60QLX7A=";
npmWorkspace = "packages/coding-agent";

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pihole-web";
version = "6.4.1";
version = "6.5";
src = fetchFromGitHub {
owner = "pi-hole";
repo = "web";
tag = "v${finalAttrs.version}";
hash = "sha256-0nhMbOEZ4Q4XxOvskcEbDkK4HqdosgAzdRF4sT9+zjQ=";
hash = "sha256-ozMqgxyYBDNeYGnZIhql7hnF8D/PwqAe9ypUkkUfKBc=";
};
propagatedBuildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Pi-hole web dashboard displaying stats and more";
homepage = "https://github.com/pi-hole/web";
changelog = "https://github.com/pi-hole/FTL/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/pi-hole/web/releases/tag/v${finalAttrs.version}";
longDescription = ''
Pi-hole's Web interface (based off of AdminLTE) provides a central
location to manage your Pi-hole and review the statistics generated by

View file

@ -35,7 +35,7 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rerun";
version = "0.32.1";
version = "0.32.2";
__structuredAttrs = true;
strictDeps = true;
@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "rerun-io";
repo = "rerun";
tag = finalAttrs.version;
hash = "sha256-WedZ5RZiin6jGx2aCe5obkkWJSnwzMoP4s+qQIyeq8Y=";
hash = "sha256-VVMogg0mWBoev9oE4CSbv2caTTpcfkReTWA1tJ2n7RI=";
};
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
--replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
'';
cargoHash = "sha256-LkZA3wcDGIGSjRkjPY7YhjlfVqlGWAMc+qIfDLFZUTE=";
cargoHash = "sha256-6cL7pocqcMiw+D7R6LIcegP4tO9fUTgXQFG51n6rsU4=";
cargoBuildFlags = [
"--package"

View file

@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "resterm";
version = "0.39.3";
version = "0.39.5";
src = fetchFromGitHub {
owner = "unkn0wn-root";
repo = "resterm";
tag = "v${finalAttrs.version}";
hash = "sha256-t5A0kFqi2q0z7zBszrGvK54vQpZG948E8byL39UfL68=";
hash = "sha256-Qd7ocX2w2dDyoXvv5oaEqpLJYieBahjjkPMom4EVBss=";
};
vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";

View file

@ -14,20 +14,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "skills";
version = "1.5.1";
version = "1.5.7";
src = fetchFromGitHub {
owner = "vercel-labs";
repo = "skills";
tag = "v${finalAttrs.version}";
hash = "sha256-JVJeottMyjxdiGPS7O4QsshKdbwbYcKMvwe/PB7I/Zw=";
hash = "sha256-Dzp0Gx+EcO7daxLTZ0QpMu4EEYdDWWEE8b5RF4Fv9QM=";
};
pnpmDeps = fetchPnpmDeps {
fetcherVersion = 3;
inherit (finalAttrs) pname version src;
inherit pnpm;
hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao=";
hash = "sha256-3GSa4ze859dRA4Yrxw8r3rwZKn7FMSjBMvpz1HTDobU=";
};
nativeBuildInputs = [

View file

@ -6,18 +6,20 @@
stress,
versionCheckHook,
writableTmpDirAsHomeHook,
snakemake,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "snakemake";
version = "9.16.3";
version = "9.21.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake";
tag = "v${finalAttrs.version}";
hash = "sha256-+eEzpRY6ZEKB3v1/AkHDg4bOcM2Y6pt4UMrdKF6soac=";
hash = "sha256-+EO+BTMkui0mJvEf0TOaCRBH8MzLsit8xK+71gujHt0=";
};
postPatch = ''
@ -33,6 +35,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
build-system = with python3Packages; [ setuptools-scm ];
pythonRelaxDeps = [
"packaging"
"sqlmodel"
];
dependencies = with python3Packages; [
appdirs
conda-inject
@ -53,20 +59,24 @@ python3Packages.buildPythonApplication (finalAttrs: {
requests
reretry
smart-open
snakemake-interface-executor-plugins
snakemake-interface-common
snakemake-interface-executor-plugins
snakemake-interface-logger-plugins
snakemake-interface-storage-plugins
snakemake-interface-report-plugins
snakemake-interface-scheduler-plugins
snakemake-interface-storage-plugins
sqlmodel
stopit
tabulate
tenacity
throttler
toposort
wrapt
yte
];
pythonImportsCheck = [ "snakemake" ];
# See
# https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99
# for the current basic test suite. Slurm, Tibanna and Tes require extra
@ -81,11 +91,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
requests-mock
snakemake-executor-plugin-cluster-generic
snakemake-storage-plugin-fs
snakemake-storage-plugin-http
snakemake-storage-plugin-s3
stress
versionCheckHook
polars
])
++ [ writableTmpDirAsHomeHook ];
++ [
versionCheckHook
writableTmpDirAsHomeHook
];
enabledTestPaths = [
"tests/tests.py"
@ -97,6 +111,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
];
disabledTests = [
# AssertionError: expected file "onerror_module2.log" not produced
"test_module_onerror"
# FAILED tests/tests.py::test_env_modules - AssertionError: expected successful execution
"test_ancient"
"test_conda_create_envs_only"
@ -119,13 +136,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
"test_issue1256"
"test_issue2574"
# Require `snakemake-storage-plugin-fs` (circular dependency)
"test_default_storage"
"test_default_storage_local_job"
"test_deploy_sources"
"test_output_file_cache_storage"
"test_storage"
# Tries to access internet
"test_report_after_run"
@ -136,10 +146,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Needs unshare
"test_nodelocal"
# Requires snakemake-storage-plugin-http
"test_keep_local"
"test_retrieve"
# Requires conda
"test_jupyter_notebook"
"test_jupyter_notebook_nbconvert"
@ -179,7 +185,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
"test_issue1331"
];
pythonImportsCheck = [ "snakemake" ];
# Circular dependencies
doCheck = false;
passthru.tests.pytest = snakemake.overridePythonAttrs {
doCheck = true;
};
meta = {
homepage = "https://snakemake.github.io";

View file

@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "speedtest-tracker";
version = "1.13.10";
version = "1.14.1";
src = fetchFromGitHub {
owner = "alexjustesen";
repo = "speedtest-tracker";
tag = "v${finalAttrs.version}";
hash = "sha256-X/ShdTGAb7qPqYlZ71rxGzAetPRexlaDQ4AYvwouddc=";
hash = "sha256-YI/LHTynR9AiC1MhXdO788imIUB/XndXozIepXkeuyc=";
};
buildInputs = [ php84 ];
@ -35,13 +35,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerNoScripts = true;
composerStrictValidation = false;
strictDeps = true;
vendorHash = "sha256-fS0Wstv6uHOE5WaDWSL4nbgpHCLM442zmPoER7ZRhfg=";
vendorHash = "sha256-Xu8Zsz5FkXiyotOZRwA9KPMHapMThmQQdVdanRGzaJc=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
hash = "sha256-qWBVonPKqyB6OrDkR1ihtVac/b0Qd++Q/W4nk/VPm9E=";
hash = "sha256-Ys3hCLLjoIrno9ztSh/m2xz1HiTn20g3Vu/Pnymy/Fc=";
};
preInstall = ''

View file

@ -30,19 +30,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "typesetter";
version = "0.12.6";
version = "0.13.1";
__structuredAttrs = true;
src = fetchFromCodeberg {
owner = "haydn";
repo = "typesetter";
tag = "v${finalAttrs.version}";
hash = "sha256-BN/gxJzJ2rjSztVWCid8y9NiHCqMVSQIW4b6VmjJGTo=";
hash = "sha256-emYFnPfDdip3ELCf7JC2+mZna8d2K2Xk3HsiF4x/nJg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-6GM3c4Pq/U5dvpR8R/d78nwoWfbUQTwhjlCOhN5UG0s=";
hash = "sha256-zBchG/uLvImV2UGD1TNdowrYO0yiSpzblwF4AvUzZl4=";
};
strictDeps = true;

View file

@ -14,6 +14,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/core/backoff"
"cmds/core/base64"
"cmds/core/basename"
"cmds/core/bind"
"cmds/core/blkid"
"cmds/core/brctl"
"cmds/core/cat"
@ -57,6 +58,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/core/losetup"
"cmds/core/ls"
"cmds/core/lsdrivers"
"cmds/core/lsfd"
"cmds/core/lsmod"
"cmds/core/man"
"cmds/core/md5sum"
@ -73,6 +75,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/core/nohup"
"cmds/core/ntpdate"
"cmds/core/pci"
"cmds/core/pidof"
"cmds/core/ping"
"cmds/core/poweroff"
"cmds/core/printenv"
@ -106,12 +109,14 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/core/true"
"cmds/core/truncate"
"cmds/core/ts"
"cmds/core/tsort"
"cmds/core/tty"
"cmds/core/umount"
"cmds/core/uname"
"cmds/core/uniq"
"cmds/core/unmount"
"cmds/core/unshare"
"cmds/core/update-rc.d"
"cmds/core/uptime"
"cmds/core/watchdog"
"cmds/core/watchdogd"
@ -126,6 +131,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/exp/bootvars"
"cmds/exp/bzimage"
"cmds/exp/cbmem"
"cmds/exp/cmd2pkg"
"cmds/exp/console"
"cmds/exp/crc"
"cmds/exp/disk_unlock"
@ -163,6 +169,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/exp/readpe"
"cmds/exp/run"
"cmds/exp/rush"
"cmds/exp/serial"
"cmds/exp/smbios_transfer"
"cmds/exp/smn"
"cmds/exp/srvfiles"
@ -174,6 +181,7 @@ u-root.overrideAttrs (prevAttrs: {
"cmds/exp/tcpdump"
"cmds/exp/tcz"
"cmds/exp/tftp"
"cmds/exp/tftpd"
"cmds/exp/traceroute"
"cmds/exp/uefiboot"
"cmds/exp/vboot"

View file

@ -158,5 +158,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ ShamrockLee ];
mainProgram = "xrootd";
};
})

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "aioamazondevices";
version = "13.5.0";
version = "13.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "chemelli74";
repo = "aioamazondevices";
tag = "v${version}";
hash = "sha256-+71t47H4/idWeef8Nf+4TVHB0xEe5mWCQ271ECm3jOg=";
hash = "sha256-j2xlCI3i+IszpDfOcUiN6yPsMzEQBUwB8Lq6c6Y/QPo=";
};
build-system = [ poetry-core ];

View file

@ -18,7 +18,7 @@
buildPythonPackage (finalAttrs: {
pname = "lance-namespace-urllib3-client";
version = "0.7.6";
version = "0.7.7";
pyproject = true;
__structuredAttrs = true;
@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: {
owner = "lancedb";
repo = "lance-namespace";
tag = "v${finalAttrs.version}";
hash = "sha256-UI6vbmquZlfDVS4R3PFxc14E+3Z6uccGfg5P/Jfs+LY=";
hash = "sha256-f+jtRAq4mI6y3q9Jt2ZqAMhXhNRavld88vWKz3VypBs=";
};
sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client";

View file

@ -30,7 +30,7 @@
buildPythonPackage (finalAttrs: {
pname = "lance-namespace";
version = "0.7.6";
version = "0.7.7";
pyproject = true;
__structuredAttrs = true;
@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
owner = "lancedb";
repo = "lance-namespace";
tag = "v${finalAttrs.version}";
hash = "sha256-UI6vbmquZlfDVS4R3PFxc14E+3Z6uccGfg5P/Jfs+LY=";
hash = "sha256-f+jtRAq4mI6y3q9Jt2ZqAMhXhNRavld88vWKz3VypBs=";
};
sourceRoot = "${finalAttrs.src.name}/python/lance_namespace";

View file

@ -1,25 +1,25 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
setuptools,
fetchFromGitHub,
lib,
pytestCheckHook,
versionCheckHook,
colorama,
colorlog,
packaging,
parse,
pathspec,
prompt-toolkit,
psutil,
requests,
resolvelib,
ruamel-yaml,
setuptools,
typing-extensions,
pathspec,
pytestCheckHook,
versionCheckHook,
nix-update-script,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "mcdreforged";
version = "2.15.7";
pyproject = true;
@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "MCDReforged";
repo = "MCDReforged";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-e1JrDh8Zio+TCVCVvH8tBE/tY5ja3Nr3dCQRJwRqYh4=";
};
@ -38,13 +38,13 @@ buildPythonPackage rec {
colorlog
packaging
parse
pathspec
prompt-toolkit
psutil
requests
resolvelib
ruamel-yaml
typing-extensions
pathspec
];
nativeCheckInputs = [
@ -52,14 +52,24 @@ buildPythonPackage rec {
versionCheckHook
];
passthru.updateScript = nix-update-script { };
pythonRelaxDeps = [ "ruamel.yaml" ];
meta = {
description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server";
changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/${finalAttrs.src.tag}";
longDescription = ''
MCDReforged (abbreviated as MCDR) is a tool which provides the
management ability of the Minecraft server using custom plugin
system. It doesn't need to modify or mod the original Minecraft
server at all.
From in-game calculator, player high-light, to manipulate
scoreboard, manage structure file and backup / load backup, you
can implement these by using MCDR and related plugins.
'';
description = "Minecraft server control tool";
homepage = "https://mcdreforged.com";
changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "mcdreforged";
maintainers = with lib.maintainers; [ moraxyc ];
};
}
})

View file

@ -34,14 +34,15 @@
buildPythonPackage (finalAttrs: {
pname = "pylance";
version = "6.0.0";
version = "6.0.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "lancedb";
repo = "lance";
tag = "v${finalAttrs.version}";
hash = "sha256-clvpPC8W6T1GkLE7DwRQ8HPexyE9rvFhCFc+SxqDPGk=";
hash = "sha256-n9x4Q1UlIuVWcDTdJd72JyQk/nuFMsWfzK2OmoO9wbU=";
};
sourceRoot = "${finalAttrs.src.name}/python";
@ -53,7 +54,7 @@ buildPythonPackage (finalAttrs: {
src
sourceRoot
;
hash = "sha256-Icl4BCBfTi6WkV3sZlyocZ0WYcXa28WJQ2w5VdhiVAU=";
hash = "sha256-b2O38ZKks6oiBAtUx0fTtFSy5nbsZCZD/BmeJY5zda8=";
};
nativeBuildInputs = [

View file

@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: {
inherit (finalAttrs) version;
format = "wheel";
python = "py2.py3";
hash = "sha256-meHaELZC6ujtn3AQB/vxXZxno54XrS99y4rFKMWa6BU=";
hash = "sha256-4kSDPW8ATfNcajb4Ebz6llwqfsX8lNYlYDZbekdcmMk=";
};
pythonRelaxDeps = [

View file

@ -2,36 +2,69 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
snakemake-interface-executor-plugins,
# dependencies
snakemake-interface-common,
snakemake-interface-executor-plugins,
# tests
pytestCheckHook,
snakemake,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-executor-plugin-cluster-generic";
version = "1.0.9";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-executor-plugin-cluster-generic";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [
poetry-core
];
propagatedBuildInputs = [
snakemake-interface-executor-plugins
dependencies = [
snakemake-interface-common
snakemake-interface-executor-plugins
];
pythonImportsCheck = [ "snakemake_executor_plugin_cluster_generic" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
writableTmpDirAsHomeHook
];
enabledTestPaths = [ "tests/tests.py" ];
disabledTestPaths = [
# Failed to setup log file: [Errno 13] Permission denied: '/build/pytest-of-nixbld/pytest-0/test_group_workflow5/groups/.snakemake'
"tests/tests.py::TestWorkflowsCancelCmd::test_group_workflow"
"tests/tests.py::TestWorkflowsCancelCmd::test_simple_workflow"
"tests/tests.py::TestWorkflowsSidecar::test_group_workflow"
"tests/tests.py::TestWorkflowsSidecar::test_simple_workflow"
"tests/tests.py::TestWorkflowsStatusCmd::test_group_workflow"
"tests/tests.py::TestWorkflowsStatusCmd::test_simple_workflow"
"tests/tests.py::TestWorkflowsSubmitCmdOnly::test_group_workflow"
"tests/tests.py::TestWorkflowsSubmitCmdOnly::test_simple_workflow"
];
meta = {
description = "Generic cluster executor for Snakemake";
homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic";
changelog = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -1,22 +1,34 @@
{
lib,
argparse-dataclass,
buildPythonPackage,
configargparse,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
# dependencies
argparse-dataclass,
configargparse,
# tests
pytestCheckHook,
snakemake,
# passthru
snakemake-interface-common,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-common";
version = "1.23.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-common";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-D3vktJmn1CifdiEg5UPGpBuuigEIb+ja4yklHZA6ytQ=";
};
@ -29,7 +41,9 @@ buildPythonPackage rec {
})
];
build-system = [ setuptools ];
build-system = [
setuptools
];
dependencies = [
argparse-dataclass
@ -38,16 +52,24 @@ buildPythonPackage rec {
pythonImportsCheck = [ "snakemake_interface_common" ];
# test_snakemake_version: No module named 'snakemake'
# nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
snakemake
];
# enabledTestPaths = [ "tests/tests.py" ];
enabledTestPaths = [ "tests/tests.py" ];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-common.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "Common functions and classes for Snakemake and its plugins";
homepage = "https://github.com/snakemake/snakemake-interface-common";
changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/v${version}";
changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -2,39 +2,66 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
# dependencies
argparse-dataclass,
throttler,
snakemake-interface-common,
throttler,
# tests
pytestCheckHook,
snakemake-executor-plugin-cluster-generic,
# passthru
snakemake-interface-executor-plugins,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-executor-plugins";
version = "9.4.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-executor-plugins";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-ePbdHMYB2LfCOglz87ZnsUkJH7B97hhSmNBGzwtl5OM=";
};
build-system = [ poetry-core ];
build-system = [
poetry-core
];
dependencies = [
argparse-dataclass
throttler
snakemake-interface-common
throttler
];
pythonImportsCheck = [ "snakemake_interface_executor_plugins" ];
nativeCheckInputs = [
pytestCheckHook
snakemake-executor-plugin-cluster-generic
];
enabledTestPaths = [ "tests/tests.py" ];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-executor-plugins.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "This package provides a stable interface for interactions between Snakemake and its executor plugins";
description = "Stable interface for interactions between Snakemake and its executor plugins";
homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins";
changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.tag}/CHANGELOG.md";
changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -2,34 +2,62 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
hatchling,
# dependencies
snakemake-interface-common,
# tests
pytestCheckHook,
snakemake-logger-plugin-rich,
# passthru
snakemake-interface-logger-plugins,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-logger-plugins";
version = "2.0.1";
version = "2.1.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-logger-plugins";
tag = "v${version}";
hash = "sha256-yvEjd4xBjjCocGK/HD1j5jcuy+syyXcEJGdsEFA0H40=";
tag = "v${finalAttrs.version}";
hash = "sha256-UBdzJtKukR4Y9KPpu8qJv4HmN9ghncvEqGsTQnHk36k=";
};
nativeBuildInputs = [ hatchling ];
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
snakemake-interface-common
];
pythonImportsCheck = [ "snakemake_interface_logger_plugins" ];
nativeCheckInputs = [
pytestCheckHook
snakemake-logger-plugin-rich
];
enabledTestPaths = [ "tests/tests.py" ];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-logger-plugins.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "Stable interface for interactions between Snakemake and its logger plugins";
homepage = "https://github.com/snakemake/snakemake-interface-logger-plugins";
changelog = "https://github.com/snakemake/snakemake-interface-logger-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -2,32 +2,62 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
# dependencies
snakemake-interface-common,
# tests
pytestCheckHook,
snakemake,
# passthru
snakemake-interface-report-plugins,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-report-plugins";
version = "1.3.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-report-plugins";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-3ugEmdO1dcusKXXBZBRszlZXX5fhJyYSSF5Uj5CKJkQ=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [
poetry-core
];
propagatedBuildInputs = [ snakemake-interface-common ];
dependencies = [
snakemake-interface-common
];
pythonImportsCheck = [ "snakemake_interface_report_plugins" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
];
enabledTestPaths = [ "tests/tests.py" ];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-report-plugins.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "Interface for Snakemake report plugins";
homepage = "https://github.com/snakemake/snakemake-interface-report-plugins";
changelog = "https://github.com/snakemake/snakemake-interface-report-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -2,41 +2,62 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
hatchling,
# dependencies
snakemake-interface-common,
# tests
pytestCheckHook,
snakemake,
# passthru
snakemake-interface-scheduler-plugins,
}:
let
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-scheduler-plugins";
version = "2.0.2";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-scheduler-plugins";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-BowMwZllFR9IKYUMhISAbf606awTxfmS/nQxkGgb4y8=";
};
in
buildPythonPackage {
pname = "snakemake-interface-scheduler-plugins";
inherit version src;
pyproject = true;
build-system = [ hatchling ];
build-system = [
hatchling
];
dependencies = [ snakemake-interface-common ];
dependencies = [
snakemake-interface-common
];
pythonImportsCheck = [ "snakemake_interface_scheduler_plugins" ];
# test_scheduler: No module named 'snakemake'
# nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
snakemake
];
# enabledTestPaths = [ "tests/tests.py" ];
enabledTestPaths = [ "tests/tests.py" ];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-scheduler-plugins.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "Provides a stable interface for interactions between Snakemake and its scheduler plugins";
homepage = "https://github.com/snakemake/snakemake-interface-scheduler-plugins";
changelog = "https://github.com/snakemake/snakemake-interface-scheduler-plugins/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/snakemake/snakemake-interface-scheduler-plugins/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kyehn ];
};
}
})

View file

@ -2,42 +2,77 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
# dependencies
humanfriendly,
reretry,
snakemake-interface-common,
tenacity,
throttler,
wrapt,
# tests
pytestCheckHook,
snakemake,
snakemake-storage-plugin-http,
# passthru
snakemake-interface-storage-plugins,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-interface-storage-plugins";
version = "4.3.2";
version = "4.4.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-interface-storage-plugins";
tag = "v${version}";
hash = "sha256-W2cUwc+9jng4IvBuN+m4WqpehA8qElTRb43w3QOIeN0=";
tag = "v${finalAttrs.version}";
hash = "sha256-tqSIJnU1+DPx/GI5/wzMkoxpLyM/k/SO8FtejRv9Zls=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
humanfriendly
reretry
snakemake-interface-common
tenacity
throttler
wrapt
];
pythonImportsCheck = [ "snakemake_interface_storage_plugins" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
snakemake-storage-plugin-http
];
enabledTestPaths = [ "tests/tests.py" ];
disabledTests = [
# Requires internet access
"test_storage"
];
# Circular dependency with snakemake
doCheck = false;
passthru.tests.pytest = snakemake-interface-storage-plugins.overridePythonAttrs {
doCheck = true;
};
meta = {
description = "This package provides a stable interface for interactions between Snakemake and its storage plugins";
description = "Stable interface for interactions between Snakemake and its storage plugins";
changelog = "https://github.com/snakemake/snakemake-interface-storage-plugins/releases/tag/${finalAttrs.src.tag}";
homepage = "https://github.com/snakemake/snakemake-interface-storage-plugins";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -0,0 +1,60 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
hatchling,
# dependencies
pydantic,
rich,
snakemake-interface-executor-plugins,
snakemake-interface-logger-plugins,
# tests
pytestCheckHook,
snakemake,
writableTmpDirAsHomeHook,
}:
buildPythonPackage (finalAttrs: {
pname = "snakemake-logger-plugin-rich";
version = "0.4.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "cademirch";
repo = "snakemake-logger-plugin-rich";
tag = "v${finalAttrs.version}";
hash = "sha256-kMjzagM95Td529JU+qIxGStgJGctS08glrFo3CF+Ih8=";
};
build-system = [
hatchling
];
dependencies = [
pydantic
rich
snakemake-interface-executor-plugins
snakemake-interface-logger-plugins
];
pythonImportsCheck = [ "snakemake_logger_plugin_rich" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
writableTmpDirAsHomeHook
];
meta = {
description = "Snakemake logger plugin using Rich";
homepage = "https://github.com/cademirch/snakemake-logger-plugin-rich";
changelog = "https://github.com/cademirch/snakemake-logger-plugin-rich/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
})

View file

@ -2,42 +2,59 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
snakemake-interface-storage-plugins,
# dependencies
snakemake-interface-common,
snakemake-interface-storage-plugins,
sysrsync,
# tests
pytestCheckHook,
snakemake,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-storage-plugin-fs";
version = "1.1.3";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-storage-plugin-fs";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-UdK0yhl7ljLh57CXAvH/OYiVyw+BjhPwGjSBXX8sbZk=";
};
build-system = [ poetry-core ];
build-system = [
poetry-core
];
dependencies = [
snakemake-interface-storage-plugins
snakemake-interface-common
snakemake-interface-storage-plugins
sysrsync
];
# The current tests are not worth dealing with cyclic dependency on snakemake
doCheck = false;
pythonImportsCheck = [ "snakemake_storage_plugin_fs" ];
# Use nothing due to a cyclic dependency on snakemake
pythonImportsCheck = [ ];
nativeCheckInputs = [
pytestCheckHook
snakemake
writableTmpDirAsHomeHook
];
enabledTestPaths = [ "tests/tests.py" ];
meta = {
description = "Snakemake storage plugin that reads and writes from a locally mounted filesystem using rsync";
homepage = "https://github.com/snakemake/snakemake-storage-plugin-fs";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-fs/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -0,0 +1,68 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
# dependencies
requests,
requests-oauthlib,
snakemake-interface-common,
snakemake-interface-storage-plugins,
# tests
pytestCheckHook,
snakemake,
}:
buildPythonPackage (finalAttrs: {
pname = "snakemake-storage-plugin-http";
version = "0.3.1";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-storage-plugin-http";
tag = "v${finalAttrs.version}";
hash = "sha256-ad4IOjU761CaZ+o0//I8/xW+e+4UJG0+VAbQ9KcNjFY=";
};
build-system = [
poetry-core
];
pythonRelaxDeps = [
"requests-oauthlib"
];
dependencies = [
requests
requests-oauthlib
snakemake-interface-common
snakemake-interface-storage-plugins
];
pythonImportsCheck = [ "snakemake_storage_plugin_http" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
];
enabledTestPaths = [ "tests/tests.py" ];
disabledTests = [
# Requires internet access
"test_storage"
];
meta = {
description = "Snakemake storage plugin for donwloading input files from HTTP(s)";
homepage = "https://github.com/snakemake/snakemake-storage-plugin-http";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-http/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
})

View file

@ -2,24 +2,33 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
poetry-core,
# dependencies
boto3,
botocore,
poetry-core,
snakemake,
snakemake-interface-storage-plugins,
snakemake-interface-common,
snakemake-interface-storage-plugins,
urllib3,
# tests
pytestCheckHook,
snakemake,
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-storage-plugin-s3";
version = "0.3.6";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-storage-plugin-s3";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-hvyQ6V6POUBWTCWt9moQlH0RgSM4J36kjbXK4TtO8Bo=";
};
@ -33,15 +42,31 @@ buildPythonPackage rec {
urllib3
];
nativeCheckInputs = [ snakemake ];
pythonImportsCheck = [ "snakemake_storage_plugin_s3" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
writableTmpDirAsHomeHook
];
enabledTestPaths = [ "tests/tests.py" ];
disabledTests = [
# Requires internet access
"test_storage"
# snakemake_interface_common.exceptions.WorkflowError: Failed to create local storage prefix .snakemake/storage/s3
# PermissionError: [Errno 13] Permission denied: '.snakemake'
"test_group_workflow"
"test_simple_workflow"
];
meta = {
description = "Snakemake storage plugin for S3 API storage (AWS S3, MinIO, etc.)";
homepage = "https://github.com/snakemake/snakemake-storage-plugin-s3";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${src.tag}";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-s3/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -1,29 +1,43 @@
{
lib,
pkgs,
buildPythonPackage,
fetchFromGitHub,
# build-system
hatch-vcs,
hatchling,
snakemake,
snakemake-interface-storage-plugins,
# dependencies
reretry,
snakemake-interface-common,
snakemake-interface-storage-plugins,
xrootd,
# tests
pytestCheckHook,
snakemake,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "snakemake-storage-plugin-xrootd";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "snakemake";
repo = "snakemake-storage-plugin-xrootd";
tag = "v${version}";
hash = "sha256-QYG/BE7y3h/Mz1PrVVxmfBBLBLoirrEx9unSEaflUds=";
tag = "v${finalAttrs.version}";
hash = "sha256-vL9JD9h0ywsKpUPoXhgg6b+vwi7kxK8CF3L6HnAEidE=";
};
# xrootd<6.0.0,>=5.6.4 not satisfied by version 5.7rc20240303
pythonRelaxDeps = [ "xrootd" ];
postPatch = ''
substituteInPlace tests/tests.py \
--replace-fail \
'subprocess.Popen(["xrootd",' \
'subprocess.Popen(["${lib.getExe pkgs.xrootd}",'
'';
build-system = [
hatch-vcs
@ -33,17 +47,24 @@ buildPythonPackage rec {
dependencies = [
snakemake-interface-storage-plugins
snakemake-interface-common
reretry
xrootd
];
nativeCheckInputs = [ snakemake ];
pythonImportsCheck = [ "snakemake_storage_plugin_xrootd" ];
nativeCheckInputs = [
pytestCheckHook
snakemake
];
enabledTestPaths = [ "tests/tests.py" ];
meta = {
description = "Snakemake storage plugin for handling input and output via XRootD";
homepage = "https://github.com/snakemake/snakemake-storage-plugin-xrootd";
changelog = "https://github.com/snakemake/snakemake-storage-plugin-xrootd/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ veprbl ];
};
}
})

View file

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.31.0";
hash = "sha256-bVsA1FOTry5OfFKkQtKhmPDMvHZ47QYqRvQD7dgz66o=";
version = "1.31.1";
hash = "sha256-n8quuPIlRLCaGadh80EsQRIhVCJAFjS+vdEpakA8xLw=";
}

View file

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.30.1";
hash = "sha256-mXZQANl0iWsxyliC2MJ5zj/n729cb58Kln7X/TQH+cw=";
version = "1.30.2";
hash = "sha256-ffMJCQf8o8wORW1twAzrIw2nTqiAJs7/Cv/CnbvZrEw=";
}

View file

@ -2,7 +2,6 @@ lib: self: super:
### Deprecated aliases - for backward compatibility
### Please maintain this list in ASCIIbetical ordering.
### Hint: the "sections" are delimited by ### <letter> ###
# These aliases should not be used within nixpkgs, but exist to improve
# backward compatibility in projects outside of nixpkgs. See the

View file

@ -18194,10 +18194,18 @@ self: super: with self; {
callPackage ../development/python-modules/snakemake-interface-storage-plugins
{ };
snakemake-logger-plugin-rich =
callPackage ../development/python-modules/snakemake-logger-plugin-rich
{ };
snakemake-storage-plugin-fs =
callPackage ../development/python-modules/snakemake-storage-plugin-fs
{ };
snakemake-storage-plugin-http =
callPackage ../development/python-modules/snakemake-storage-plugin-http
{ };
snakemake-storage-plugin-s3 =
callPackage ../development/python-modules/snakemake-storage-plugin-s3
{ };