Merge master into staging-nixos
This commit is contained in:
@@ -28117,12 +28117,6 @@
|
||||
githubId = 50843046;
|
||||
name = "tornax";
|
||||
};
|
||||
toschmidt = {
|
||||
email = "tobias.schmidt@in.tum.de";
|
||||
github = "toschmidt";
|
||||
githubId = 27586264;
|
||||
name = "Tobias Schmidt";
|
||||
};
|
||||
totalchaos = {
|
||||
email = "basil.keeler@outlook.com";
|
||||
github = "totalchaos05";
|
||||
|
||||
@@ -40,7 +40,6 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
seatd
|
||||
sdnotify-wrapper
|
||||
];
|
||||
users.groups.seat = lib.mkIf (cfg.group == "seat") { };
|
||||
|
||||
@@ -55,7 +54,7 @@ in
|
||||
Type = "notify";
|
||||
NotifyAccess = "all";
|
||||
SyslogIdentifier = "seatd";
|
||||
ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
|
||||
ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
|
||||
RestartSec = 1;
|
||||
Restart = "always";
|
||||
};
|
||||
|
||||
@@ -45,9 +45,19 @@ let
|
||||
|
||||
setSessionScript = pkgs.callPackage ../x11/display-managers/account-service-util.nix { };
|
||||
|
||||
greeterEnvFile = pkgs.writeText "gdm-greeter-env" ''
|
||||
DCONF_PROFILE=gdm
|
||||
'';
|
||||
greeterUsers = lib.genAttrs' [ null 1 2 3 4 ] (
|
||||
i:
|
||||
let
|
||||
# adding 1 to create `gdm-greeter{-2,-3,-4,-5}`
|
||||
suffix = lib.optionalString (i != null) "-${toString (i + 1)}";
|
||||
in
|
||||
lib.nameValuePair "gdm-greeter${suffix}" {
|
||||
isSystemUser = true;
|
||||
uid = 60578 + (if i == null then 0 else i);
|
||||
group = "gdm";
|
||||
home = "/run/gdm/home/gdm-greeter${suffix}";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
||||
{
|
||||
@@ -190,6 +200,8 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
warnings = lib.optional config.services.pulseaudio.enable "Support for Pulseaudio + gdm will be removed in NixOS 26.11";
|
||||
|
||||
services.xserver.displayManager.lightdm.enable = false;
|
||||
|
||||
users.users = lib.mkMerge [
|
||||
@@ -200,24 +212,8 @@ in
|
||||
group = "gdm";
|
||||
description = "GDM user";
|
||||
};
|
||||
|
||||
gdm-greeter = {
|
||||
isSystemUser = true;
|
||||
uid = 60578;
|
||||
group = "gdm";
|
||||
home = "/run/gdm";
|
||||
};
|
||||
}
|
||||
|
||||
(lib.genAttrs' [ 1 2 3 4 ] (
|
||||
i:
|
||||
lib.nameValuePair "gdm-greeter-${toString i}" {
|
||||
isSystemUser = true;
|
||||
uid = 60578 + i;
|
||||
group = "gdm";
|
||||
home = "/run/gdm-${toString i}";
|
||||
}
|
||||
))
|
||||
greeterUsers
|
||||
];
|
||||
|
||||
users.groups.gdm.gid = config.ids.gids.gdm;
|
||||
@@ -259,17 +255,20 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /run/gdm/.config 0711 gdm gdm"
|
||||
]
|
||||
++ lib.optionals config.services.pulseaudio.enable [
|
||||
"d /run/gdm/.config/pulse 0711 gdm gdm"
|
||||
"L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
|
||||
]
|
||||
++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
|
||||
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
|
||||
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
|
||||
];
|
||||
systemd.tmpfiles.rules =
|
||||
lib.optionals config.services.pulseaudio.enable (
|
||||
lib.concatLists (
|
||||
lib.mapAttrsToList (name: user: [
|
||||
"d ${user.home}/.config 0711 ${name} gdm"
|
||||
"d ${user.home}/.config/pulse 0711 ${name} gdm"
|
||||
"L+ ${user.home}/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
|
||||
]) greeterUsers
|
||||
)
|
||||
)
|
||||
++ lib.optionals config.services.gnome.gnome-initial-setup.enable [
|
||||
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
|
||||
"f /run/gdm/gdm.ran-initial-setup 0711 gdm gdm - yes"
|
||||
];
|
||||
|
||||
# Otherwise GDM will not be able to start correctly and display Wayland sessions
|
||||
systemd.packages = [
|
||||
@@ -456,12 +455,6 @@ in
|
||||
settings.conffile = "/etc/pam/environment";
|
||||
settings.readenv = 0;
|
||||
}
|
||||
{
|
||||
name = "env-greeter";
|
||||
control = "required";
|
||||
modulePath = "${config.security.pam.package}/lib/security/pam_env.so";
|
||||
settings.envfile = greeterEnvFile;
|
||||
}
|
||||
{
|
||||
name = "systemd";
|
||||
control = "optional";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -524,6 +524,19 @@ let
|
||||
tmpfs = null;
|
||||
};
|
||||
|
||||
# Parses an IPv4 address with an optional prefix
|
||||
ipv4FromString =
|
||||
str:
|
||||
let
|
||||
segments = lib.splitString "/" str;
|
||||
prefix = lib.elemAt segments 1;
|
||||
hasPrefix = builtins.length segments == 2;
|
||||
in
|
||||
{
|
||||
address = lib.head segments;
|
||||
prefixLength = if hasPrefix then builtins.fromJSON prefix else 32;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@@ -594,6 +607,14 @@ in
|
||||
boot.isNspawnContainer = true;
|
||||
networking.hostName = mkDefault name;
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces = lib.mkIf config.privateNetwork {
|
||||
eth0.ipv4.addresses = lib.optional (config.localAddress != null) (
|
||||
ipv4FromString config.localAddress
|
||||
);
|
||||
eth0.ipv6.addresses = lib.optional (config.localAddress6 != null) (
|
||||
lib.network.ipv6.fromString config.localAddress6
|
||||
);
|
||||
};
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
|
||||
@@ -245,6 +245,7 @@ in
|
||||
authelia = runTest ./authelia.nix;
|
||||
auto-cpufreq = runTest ./auto-cpufreq.nix;
|
||||
autobrr = runTest ./autobrr.nix;
|
||||
autopush-rs = runTest ./autopush-rs.nix;
|
||||
autosuspend = runTest ./autosuspend.nix;
|
||||
avahi = runTest {
|
||||
imports = [ ./avahi.nix ];
|
||||
@@ -386,6 +387,7 @@ in
|
||||
containers-custom-pkgs = runTest ./containers-custom-pkgs.nix;
|
||||
containers-ephemeral = runTest ./containers-ephemeral.nix;
|
||||
containers-extra_veth = runTest ./containers-extra_veth.nix;
|
||||
containers-gateway = runTest ./containers-gateway.nix;
|
||||
containers-hosts = runTest ./containers-hosts.nix;
|
||||
containers-imperative = runTest ./containers-imperative.nix;
|
||||
containers-ip = runTest ./containers-ip.nix;
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
_class = "nixosTest";
|
||||
name = "autopush-rs";
|
||||
|
||||
nodes = {
|
||||
machine =
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
environment.systemPackages = [
|
||||
pkgs.curl
|
||||
];
|
||||
|
||||
services.redis.servers.autopush-rs = {
|
||||
enable = true;
|
||||
port = 6000;
|
||||
};
|
||||
system.services.autopush-autoconnect = {
|
||||
imports = [
|
||||
pkgs.autopush-rs.services.autoconnect
|
||||
];
|
||||
autoconnect.settings = {
|
||||
#do not use this key in production!!!
|
||||
crypto_key = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]";
|
||||
db_dsn = "redis://localhost:${toString config.services.redis.servers.autopush-rs.port}";
|
||||
port = 8000;
|
||||
};
|
||||
};
|
||||
system.services.autopush-autoendpoint = {
|
||||
imports = [
|
||||
pkgs.autopush-rs.services.autoendpoint
|
||||
];
|
||||
autoendpoint.settings = {
|
||||
#do not use this key in production!!!
|
||||
crypto_key = "[fZQX8jgdESUYFTYfWw3Dv5RRMuwYJPPaaPcbUgHM69Q=]";
|
||||
db_dsn = "redis://localhost:${toString config.services.redis.servers.autopush-rs.port}";
|
||||
port = 8080;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
8080
|
||||
8000
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_unit("autopush-autoconnect.service")
|
||||
machine.wait_for_unit("autopush-autoendpoint.service")
|
||||
machine.wait_for_open_port(8080)
|
||||
machine.wait_for_open_port(8000)
|
||||
machine.succeed("curl -s -f http://localhost:8080/health")
|
||||
machine.succeed("curl -s -f http://localhost:8000/health")
|
||||
'';
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ zimward ];
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
let
|
||||
hostIp4 = "192.168.0.1";
|
||||
containerIp4 = "192.168.0.100/24";
|
||||
hostIp6 = "fc00::1";
|
||||
containerIp6 = "fc00::2/7";
|
||||
in
|
||||
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "containers-gateway";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
rnhmjoj
|
||||
];
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
networking.bridges = {
|
||||
br0.interfaces = [ ];
|
||||
};
|
||||
networking.interfaces = {
|
||||
br0.ipv4.addresses = [
|
||||
{
|
||||
address = hostIp4;
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
br0.ipv6.addresses = [
|
||||
{
|
||||
address = hostIp6;
|
||||
prefixLength = 7;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
containers.test = {
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostBridge = "br0";
|
||||
localAddress = containerIp4;
|
||||
localAddress6 = containerIp6;
|
||||
config.networking = {
|
||||
defaultGateway.address = hostIp4;
|
||||
defaultGateway6.address = hostIp6;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
def container_succeed(command: str):
|
||||
machine.succeed(f"nixos-container run test -- {command}")
|
||||
|
||||
machine.wait_for_unit("default.target")
|
||||
assert "test" in machine.succeed("nixos-container list")
|
||||
|
||||
with subtest("Container has started"):
|
||||
assert "up" in machine.succeed("nixos-container status test")
|
||||
|
||||
with subtest("Container can ping the host"):
|
||||
container_succeed("ping -n -c 1 ${hostIp4}")
|
||||
container_succeed("ping -n -c 1 ${hostIp6}")
|
||||
|
||||
with subtest("Container default gateways are set"):
|
||||
container_succeed("ip -4 route show default | grep 'via ${hostIp4}'")
|
||||
container_succeed("ip -6 route show default | grep 'via ${hostIp6}'")
|
||||
'';
|
||||
}
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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}"));
|
||||
|
||||
@@ -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"])
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "ms-python";
|
||||
name = "flake8";
|
||||
version = "2026.4.0";
|
||||
hash = "sha256-2o6a0wPYVFa+XWQoKBxKcWxlH8IPOzKxtXNt7qUi9mM=";
|
||||
version = "2026.6.0";
|
||||
hash = "sha256-n++DEjZsNY3YkvldyWuk3dCYgFbIxqMOun42lWEHGog=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hypr-darkwindow";
|
||||
version = "0.54.3";
|
||||
version = "0.55.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micha4w";
|
||||
repo = "Hypr-DarkWindow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nbaNBxREqiqc6bwUkgfyuCah61O89atJyNTPYq4Xij8=";
|
||||
hash = "sha256-8Ht9yhlwOtDWFvL6VYlryNxyRethFqc0iWtBetP0xws=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
cp sources/include${if stdenv.hostPlatform.is64bit then "64" else "32"}/* sources/
|
||||
make -C sources clean
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"-C sources"
|
||||
"CC:=$(CC)"
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
let
|
||||
pname = "apidog";
|
||||
version = "2.8.28";
|
||||
version = "2.8.30";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
|
||||
hash = "sha256-P338wk3YrNaeMwhMyMCKZOY2mIi2A6V+RG4f9qSHBhg=";
|
||||
hash = "sha256-h5h/zhUbnYYtYVyWySLZk3QISd4VWs5Gl/JdhgMJKh8=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -36,6 +36,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-pRYXzFUbVXYwD7edhBoVcVo/QDo6QSJJQd58Hf3rBGo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Launch4j does not publish the Linux workdir artifact selected on aarch64.
|
||||
# Nixpkgs only needs the cross-platform jar, so remove the Windows exe task.
|
||||
./remove-launch4j.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
makeWrapper
|
||||
@@ -52,8 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
gradleFlags = [
|
||||
"-Dorg.gradle.java.home=${jdk17_headless.home}"
|
||||
"--exclude-task"
|
||||
"createExe"
|
||||
];
|
||||
|
||||
installPhase =
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 474c0c0..59fc2d2 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -24,7 +24,6 @@ plugins {
|
||||
id 'org.cadixdev.licenser' version '0.6.1'
|
||||
id 'com.adarshr.test-logger' version '4.0.0'
|
||||
id 'edu.sc.seis.macAppBundle' version '2.3.0'
|
||||
- id 'edu.sc.seis.launch4j' version '3.0.6'
|
||||
id 'de.undercouch.download' version '5.6.0'
|
||||
id 'com.github.johnrengelman.shadow' version '8.1.1'
|
||||
id 'com.github.ben-manes.versions' version '0.52.0'
|
||||
@@ -282,34 +281,15 @@ def currentYear() {
|
||||
return df.format(new Date())
|
||||
}
|
||||
|
||||
-launch4j {
|
||||
- outfile = "ATLauncher-${project.version}.exe"
|
||||
- jreMinVersion = "${project.targetCompatibility.toString()}"
|
||||
- mainClassName = 'com.atlauncher.App'
|
||||
- icon = "${projectDir}/src/main/resources/assets/image/icon.ico"
|
||||
- version = "${project.version}"
|
||||
- textVersion = "${project.version}"
|
||||
- copyright = "2013-${currentYear()} ${project.name}"
|
||||
- companyName = "${project.name}"
|
||||
- bundledJrePath = "jre/;%JAVA_HOME%;%PATH%"
|
||||
- jvmOptions = [
|
||||
- "-Djna.nosys=true",
|
||||
- "-Djava.net.preferIPv4Stack=true",
|
||||
- "-Dawt.useSystemAAFontSettings=on",
|
||||
- "-Dswing.aatext=true"
|
||||
- ]
|
||||
-}
|
||||
|
||||
artifacts {
|
||||
archives shadowJar
|
||||
- archives file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.exe').replace('libs', 'launch4j'))
|
||||
archives file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.zip').replace('libs', 'distributions'))
|
||||
}
|
||||
|
||||
task copyArtifacts(type: Copy) {
|
||||
dependsOn build
|
||||
from shadowJar
|
||||
- from file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.exe').replace('libs', 'launch4j'))
|
||||
from file(project.tasks.jar.getArchivePath().getPath().replace('.jar', '.zip').replace('libs', 'distributions'))
|
||||
into "${projectDir}/dist"
|
||||
}
|
||||
@@ -368,14 +348,6 @@ clean.doFirst {
|
||||
delete "${projectDir}/dist"
|
||||
}
|
||||
|
||||
-project.afterEvaluate {
|
||||
- tasks.check {
|
||||
- dependsOn -= tasks.find {
|
||||
- it.name.equals("checkLicenses")
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
def shouldIgnoreUpdate = { String version -> return ['ALPHA', 'BETA', 'RC', '-M'].any { it -> version.toUpperCase(Locale.ENGLISH).contains(it) } }
|
||||
tasks.named("dependencyUpdates").configure {
|
||||
rejectVersionIf {
|
||||
@@ -385,8 +357,6 @@ tasks.named("dependencyUpdates").configure {
|
||||
|
||||
build.finalizedBy copyArtifacts
|
||||
shadowJar.dependsOn jar
|
||||
-build.dependsOn createExe, createMacApp
|
||||
startScripts.dependsOn shadowJar
|
||||
-createExe.dependsOn shadowJar
|
||||
createAppZip.dependsOn downloadNewerUniversalJavaApplicationStub
|
||||
createDmg.dependsOn downloadNewerUniversalJavaApplicationStub
|
||||
@@ -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 = [
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
nixosTests,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
pkg-config,
|
||||
cmake,
|
||||
openssl,
|
||||
libffi,
|
||||
grpc,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
}:
|
||||
let
|
||||
#script to generate the fernet key
|
||||
fernetKey =
|
||||
{
|
||||
src,
|
||||
version,
|
||||
}:
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "fernet_key";
|
||||
inherit version src;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
format = "other";
|
||||
|
||||
# this would run the upstream docker makefile
|
||||
dontBuild = true;
|
||||
|
||||
dependencies = [ python3Packages.cryptography ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
echo "#!/usr/bin/env python3" | \
|
||||
cat - $src/scripts/fernet_key.py > $out/bin/fernet_key
|
||||
chmod +x $out/bin/fernet_key
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "autopush";
|
||||
version = "1.81.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"fernet"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-services";
|
||||
repo = "autopush-rs";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DP02mcEMoQoJqi5rw5eSuep0i7zeJ0LLYsakikt9hho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LqmuUtFF30TO6iw7LPFB7yJGrzrhh7R0OKCWMhe/OjU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
libffi
|
||||
grpc
|
||||
];
|
||||
|
||||
# by default only google bigtable is supported as a db
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"postgres"
|
||||
"redis"
|
||||
"reliable_report"
|
||||
];
|
||||
|
||||
env = {
|
||||
#needed for bingen to find libc
|
||||
BINDGEN_EXTRA_CLANG_ARGS = "-I${stdenv.cc.libc.dev}/include";
|
||||
CMAKE_POLICY_VERSION_MINIMUM = "3.5";
|
||||
};
|
||||
|
||||
#check build fails
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $fernet/bin
|
||||
ln -s ${fernetKey { inherit (finalAttrs) src version; }}/bin/fernet_key $fernet/bin/fernet_key
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = nixosTests.autopush-rs;
|
||||
services.autoconnect = {
|
||||
imports = [
|
||||
(lib.modules.importApply ./service-autoconnect.nix { inherit pkgs; })
|
||||
];
|
||||
package = finalAttrs.finalPackage.out;
|
||||
};
|
||||
services.autoendpoint = {
|
||||
imports = [
|
||||
(lib.modules.importApply ./service-autoendpoint.nix { inherit pkgs; })
|
||||
];
|
||||
package = finalAttrs.finalPackage.out;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Push server and Push Endpoint";
|
||||
homepage = "https://mozilla-services.github.io/autopush-rs/index.html";
|
||||
changelog = "https://github.com/mozilla-services/autopush-rs/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mpl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [
|
||||
lib.maintainers.zimward
|
||||
];
|
||||
# install the fernet_key script in devshells as users will only use it once most likely
|
||||
outputsToInstall = [
|
||||
"out"
|
||||
"fernet"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,96 @@
|
||||
#v Non-module dependencies (`importApply`)
|
||||
{ pkgs }:
|
||||
|
||||
# Service module
|
||||
{
|
||||
lib,
|
||||
options,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.autoconnect;
|
||||
tomlFmt = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
_class = "service";
|
||||
options = {
|
||||
package = lib.mkPackageOption pkgs "autopush-rs.out" { };
|
||||
autoconnect.settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = tomlFmt.type;
|
||||
options = {
|
||||
db_dsn = lib.mkOption {
|
||||
description = "Endpoint of the database server.";
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = "";
|
||||
};
|
||||
};
|
||||
config =
|
||||
let
|
||||
configFile = tomlFmt.generate "autoconnect.toml" cfg.settings;
|
||||
in
|
||||
{
|
||||
process.argv = [
|
||||
"${config.package}/bin/autoconnect"
|
||||
"-c"
|
||||
(toString configFile)
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs (options ? systemd) {
|
||||
systemd.service = {
|
||||
after = [ "network.target" ];
|
||||
wants = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
|
||||
#hardening
|
||||
MemoryDenyWriteExecute = true;
|
||||
StateDirectoryMode = 0700;
|
||||
UMask = 077;
|
||||
DynamicUser = true;
|
||||
PrivateUsers = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
ProtectSystem = "full";
|
||||
ProtectHome = true;
|
||||
NoNewPrivileges = true;
|
||||
RuntimeDirectoryMode = 755;
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RemoveIPC = true;
|
||||
SystemCallArchitectures = "native";
|
||||
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
|
||||
SystemCallFilter = [
|
||||
"~@clock"
|
||||
"~@cpu-emulation"
|
||||
"~@debug"
|
||||
"~@module"
|
||||
"~@mount"
|
||||
"~@obsolete"
|
||||
"~@raw-io"
|
||||
"~@reboot"
|
||||
"~@swap"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
# Non-module dependencies (`importApply`)
|
||||
{ pkgs }:
|
||||
|
||||
# Service module
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.autoendpoint;
|
||||
tomlFmt = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
_class = "service";
|
||||
options = {
|
||||
package = lib.mkPackageOption pkgs "autopush-rs.out" { };
|
||||
autoendpoint = {
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = tomlFmt.type;
|
||||
options = {
|
||||
db_dsn = lib.mkOption {
|
||||
description = "Endpoint of the database server.";
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
config =
|
||||
let
|
||||
configFile = tomlFmt.generate "autoendpoint.toml" cfg.settings;
|
||||
in
|
||||
{
|
||||
process.argv = [
|
||||
"${config.package}/bin/autoendpoint"
|
||||
"-c"
|
||||
(toString configFile)
|
||||
];
|
||||
}
|
||||
// lib.optionalAttrs (options ? systemd) {
|
||||
systemd.service = {
|
||||
after = [ "network.target" ];
|
||||
wants = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
|
||||
#hardening
|
||||
MemoryDenyWriteExecute = true;
|
||||
StateDirectoryMode = 0700;
|
||||
UMask = 077;
|
||||
DynamicUser = true;
|
||||
PrivateUsers = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
ProtectSystem = "full";
|
||||
ProtectHome = true;
|
||||
NoNewPrivileges = true;
|
||||
RuntimeDirectoryMode = 755;
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RemoveIPC = true;
|
||||
SystemCallArchitectures = "native";
|
||||
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
|
||||
SystemCallFilter = [
|
||||
"~@clock"
|
||||
"~@cpu-emulation"
|
||||
"~@debug"
|
||||
"~@module"
|
||||
"~@mount"
|
||||
"~@obsolete"
|
||||
"~@raw-io"
|
||||
"~@reboot"
|
||||
"~@swap"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -22,9 +22,9 @@
|
||||
},
|
||||
"acrtransfer": {
|
||||
"pname": "acrtransfer",
|
||||
"version": "1.1.1b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-1.1.1b1-py3-none-any.whl",
|
||||
"hash": "sha256-9rbBiFCxK0cInu5puF5y2kAYcQ7xFa/X3/va5n5i/J0=",
|
||||
"version": "2.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-2.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-nG+BxgBHoi4hCF/j4wLbpOlI2MIKB8JjdJoz2LRD+iE=",
|
||||
"description": "Microsoft Azure Command-Line Tools Acrtransfer Extension"
|
||||
},
|
||||
"ad": {
|
||||
@@ -50,9 +50,9 @@
|
||||
},
|
||||
"aks-preview": {
|
||||
"pname": "aks-preview",
|
||||
"version": "20.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-arH7mhRieuEn5s2G8dpZsqk/RKyuslEphOi62FviS7U=",
|
||||
"version": "20.0.0b8",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b8-py2.py3-none-any.whl",
|
||||
"hash": "sha256-ugLew461nhWWg73OZJW7g/xblclV5IfNHKm1it6j+Dc=",
|
||||
"description": "Provides a preview for upcoming AKS features"
|
||||
},
|
||||
"alb": {
|
||||
@@ -153,11 +153,18 @@
|
||||
"hash": "sha256-sdk0uNtQX6yBiEboywNE8FAreY1pBiimah0PdmCDRYg=",
|
||||
"description": "Microsoft Azure Command-Line Tools AutomationClient Extension"
|
||||
},
|
||||
"azure-changesafety": {
|
||||
"pname": "azure-changesafety",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-ZR2Bm9U9C4rXrCfPVGRu65MBFjZ4iUtXS44l+ClJXsY=",
|
||||
"description": "Microsoft Azure Command-Line Tools ChangeSafety Extension"
|
||||
},
|
||||
"azure-firewall": {
|
||||
"pname": "azure-firewall",
|
||||
"version": "2.1.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.1.1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-gjt7/Ba38xrpdRyc4oybPbqmhOqZ8Ik/dNP8XRzm4Wc=",
|
||||
"version": "2.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.2.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-f1ZxkLZVI4+kzUmwOnY8hMaR/nuxqnLM92xlLQG3rIw=",
|
||||
"description": "Manage Azure Firewall resources"
|
||||
},
|
||||
"azurelargeinstance": {
|
||||
@@ -202,6 +209,13 @@
|
||||
"hash": "sha256-w+HDLtCIAIhlFTpR4iUMEKPC2vInPWWmMTX0VT9q1lg=",
|
||||
"description": "Microsoft Azure Command-Line Tools Carbon Extension"
|
||||
},
|
||||
"cdn": {
|
||||
"pname": "cdn",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/cdn-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-YybIrCjZnZQ0IFgOZbm4JfMnXNC/Sah8YaZuss1M5B4=",
|
||||
"description": "Microsoft Azure Command-Line Tools CDN and AFD Extension"
|
||||
},
|
||||
"change-analysis": {
|
||||
"pname": "change-analysis",
|
||||
"version": "0.1.0",
|
||||
@@ -309,9 +323,9 @@
|
||||
},
|
||||
"databricks": {
|
||||
"pname": "databricks",
|
||||
"version": "1.3.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.1-py3-none-any.whl",
|
||||
"hash": "sha256-D6+Sbp49vxPP/IENPPn6TSL3qhwgBZyWBB3KjSgjdCc=",
|
||||
"version": "1.3.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.2-py3-none-any.whl",
|
||||
"hash": "sha256-iGI+Fk/kVT2/4CspDu/r2UlDrXimUWWx9IAknnNjqhg=",
|
||||
"description": "Microsoft Azure Command-Line Tools DatabricksClient Extension"
|
||||
},
|
||||
"datadog": {
|
||||
@@ -337,9 +351,9 @@
|
||||
},
|
||||
"dataprotection": {
|
||||
"pname": "dataprotection",
|
||||
"version": "1.9.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.9.0-py3-none-any.whl",
|
||||
"hash": "sha256-YGJlWG4VPvcyKJ2qOnkgt1JYXqPF9LTrnvdTkIZcF30=",
|
||||
"version": "1.10.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.10.0-py3-none-any.whl",
|
||||
"hash": "sha256-cssrKqmWbQv3qlr8A3GUNklnIGOQ9V2x3e+YWpXeCvQ=",
|
||||
"description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension"
|
||||
},
|
||||
"datashare": {
|
||||
@@ -482,6 +496,13 @@
|
||||
"hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=",
|
||||
"description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension"
|
||||
},
|
||||
"fileshares": {
|
||||
"pname": "fileshares",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshares-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-IrJwPQaMuX9VItIEkJzK3cmANHzU50fIaWn2s32nDVk=",
|
||||
"description": "Commands for managing Azure file shares, snapshots, and private endpoint connections"
|
||||
},
|
||||
"firmwareanalysis": {
|
||||
"pname": "firmwareanalysis",
|
||||
"version": "2.0.1",
|
||||
@@ -491,9 +512,9 @@
|
||||
},
|
||||
"fleet": {
|
||||
"pname": "fleet",
|
||||
"version": "1.9.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.9.0-py3-none-any.whl",
|
||||
"hash": "sha256-5CsWYP0r2UfUTekKDsqWBNonDOPaR5TrhxZDF7hAtXI=",
|
||||
"version": "1.10.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.0-py3-none-any.whl",
|
||||
"hash": "sha256-hgAwdLExAvKR0G9Ey81rTSa2QLxeoMnUZ7KRaCYhfM8=",
|
||||
"description": "Microsoft Azure Command-Line Tools Fleet Extension"
|
||||
},
|
||||
"fluid-relay": {
|
||||
@@ -512,9 +533,9 @@
|
||||
},
|
||||
"front-door": {
|
||||
"pname": "front-door",
|
||||
"version": "2.1.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.1.0-py3-none-any.whl",
|
||||
"hash": "sha256-7aa9A+tq+qXzMuabG9McHkXpU3TRZVjQWDbmuHTTsFk=",
|
||||
"version": "2.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.2.0-py3-none-any.whl",
|
||||
"hash": "sha256-5vj/OzbfMmv/SI8qS659o+QiMfPofoBCJR/mQV3XZNE=",
|
||||
"description": "Manage networking Front Doors"
|
||||
},
|
||||
"fzf": {
|
||||
@@ -573,6 +594,13 @@
|
||||
"hash": "sha256-VTL1/L/UfORNWvyY0hvSJrvoz5zHabLPFX/sEdQaLhI=",
|
||||
"description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"
|
||||
},
|
||||
"horizondb": {
|
||||
"pname": "horizondb",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-bvjD6FSGjkuMjnc1XYnglbzd2cLMDuwRiPW9+7n6efA=",
|
||||
"description": "Microsoft Azure Command-Line Tools HorizonDB Extension"
|
||||
},
|
||||
"hpc-cache": {
|
||||
"pname": "hpc-cache",
|
||||
"version": "0.1.6",
|
||||
@@ -680,9 +708,9 @@
|
||||
},
|
||||
"maintenance": {
|
||||
"pname": "maintenance",
|
||||
"version": "1.7.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-ebiJ8U5FyRLG9VHBGB75AqkjPVars8kGxWnjUCMiiCI=",
|
||||
"version": "2.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-2.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-ax3HeCaCq9p5fokc9W3y2XtVHsRYNTZQRkNfXqwpPGk=",
|
||||
"description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"
|
||||
},
|
||||
"managedccfs": {
|
||||
@@ -694,10 +722,10 @@
|
||||
},
|
||||
"managednetworkfabric": {
|
||||
"pname": "managednetworkfabric",
|
||||
"version": "9.1.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-9.1.1-py3-none-any.whl",
|
||||
"hash": "sha256-bLPE5Spy4Lhtv6ZEWx2E2nLRqkrZ/LfJVmDQWjqEZi0=",
|
||||
"description": "Support for managednetworkfabric commands based on 2025-07-15 API version"
|
||||
"version": "10.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-10.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-7veSgSJp7isa+JwAiep+3dMTJFLohIAHNcF9UVIFaNc=",
|
||||
"description": "Support for managednetworkfabric commands based on 2026-01-15-preview API version"
|
||||
},
|
||||
"managementpartner": {
|
||||
"pname": "managementpartner",
|
||||
@@ -757,9 +785,9 @@
|
||||
},
|
||||
"monitor-pipeline-group": {
|
||||
"pname": "monitor-pipeline-group",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-oVPbg8B2TMiHSNKMakl45zkfJenXX5el0tEjirIi9/k=",
|
||||
"description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension"
|
||||
},
|
||||
"multicloud-connector": {
|
||||
@@ -853,6 +881,13 @@
|
||||
"hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=",
|
||||
"description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"
|
||||
},
|
||||
"planetarycomputer": {
|
||||
"pname": "planetarycomputer",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/planetarycomputer-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-FPvUcZx5yHHB2du7F6ulDjoNsNCek2HtuVMJd6g0mBE=",
|
||||
"description": "Microsoft Azure Command-Line Tools Planetary Computer Extension"
|
||||
},
|
||||
"portal": {
|
||||
"pname": "portal",
|
||||
"version": "1.0.0b2",
|
||||
@@ -890,9 +925,9 @@
|
||||
},
|
||||
"quantum": {
|
||||
"pname": "quantum",
|
||||
"version": "1.0.0b12",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b12-py3-none-any.whl",
|
||||
"hash": "sha256-9tjBvpu1F2/2JYKUD2IbxUckYofUH0rEnimkpRXF2wY=",
|
||||
"version": "1.0.0b13",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b13-py3-none-any.whl",
|
||||
"hash": "sha256-zNyvYvtJY2AgASUoMvN/cCXWIOJ1d3JEQ7G/tuyV/o4=",
|
||||
"description": "Microsoft Azure Command-Line Tools Quantum Extension"
|
||||
},
|
||||
"qumulo": {
|
||||
@@ -909,6 +944,13 @@
|
||||
"hash": "sha256-i0w0dd8MNUTbzCjkh161sWPXK0Cv9CUKr9rZQYDD+ZU=",
|
||||
"description": "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension"
|
||||
},
|
||||
"relationship": {
|
||||
"pname": "relationship",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/relationship-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-pEXG6+Gf/JlzjeQGw0VadoArnX+2yjhYVMxg78Qg06g=",
|
||||
"description": "Microsoft Azure Command-Line Tools Relationship Extension"
|
||||
},
|
||||
"reservation": {
|
||||
"pname": "reservation",
|
||||
"version": "0.3.1",
|
||||
@@ -965,11 +1007,18 @@
|
||||
"hash": "sha256-VRFUS040KwOkpCY2F8YD2HRCrVF5zp2MDR/RCRX5O3o=",
|
||||
"description": "Microsoft Azure Command-Line Tools Sentinel Extension"
|
||||
},
|
||||
"servicegroup": {
|
||||
"pname": "servicegroup",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/servicegroup-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-6vOfQdjX+/4Sba1qswxVcDBy+xLCgNOEG01wLL10GvQ=",
|
||||
"description": "Microsoft Azure Command-Line Tools ServiceGroup Extension"
|
||||
},
|
||||
"sftp": {
|
||||
"pname": "sftp",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/sftp-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-3ugWIeKK9U8vKgFMbQfMKXxbgW+zO9IB6lPYJFHZm/E=",
|
||||
"version": "1.0.0b3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/sftp-1.0.0b3-py3-none-any.whl",
|
||||
"hash": "sha256-hCpM/ZAJjn4hLElyLzwZzthR4OF36tPDevC2UlR0q0U=",
|
||||
"description": "Secure access to Azure Storage blob data via SFTP with SSH certificates"
|
||||
},
|
||||
"site": {
|
||||
@@ -995,9 +1044,9 @@
|
||||
},
|
||||
"stack-hci-vm": {
|
||||
"pname": "stack-hci-vm",
|
||||
"version": "1.13.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.13.0-py3-none-any.whl",
|
||||
"hash": "sha256-/GKJy7+iT33evnZ4UpNXB9GNBWtiLIOJXhk5VZowIos=",
|
||||
"version": "1.14.5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.14.5-py3-none-any.whl",
|
||||
"hash": "sha256-JE2Qq5OPy+AnTn4GxFeDhiyuCnUV3v1ciu7AqP2TwR4=",
|
||||
"description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
|
||||
},
|
||||
"standbypool": {
|
||||
@@ -1051,9 +1100,9 @@
|
||||
},
|
||||
"stream-analytics": {
|
||||
"pname": "stream-analytics",
|
||||
"version": "1.0.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.2-py3-none-any.whl",
|
||||
"hash": "sha256-HAkhteF4LaAO3YnOrWHvHJ+9K6Kd4ns9GCcnDXDJtLg=",
|
||||
"version": "1.0.3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.3-py3-none-any.whl",
|
||||
"hash": "sha256-FFRNCsg9Put3GcARODA6HpwGXbWfD1kb7qDvc+/TAkg=",
|
||||
"description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension"
|
||||
},
|
||||
"subscription": {
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.85.0";
|
||||
version = "2.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
tag = "azure-cli-${version}";
|
||||
hash = "sha256-fNch6QiiHffyHOHw30dlRoe5UFvGVIZkneULjNihGdU=";
|
||||
hash = "sha256-3C39e9C3m9M0faGUgOEWo66fFGDytfGohgUYX55VN8g=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
||||
@@ -34,6 +34,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [ SDL ];
|
||||
|
||||
# CMake's default framework search order on Darwin finds Kernel.framework
|
||||
# headers while detecting SDL 1.2, which makes standard includes like
|
||||
# <string.h> resolve to the wrong SDK header and breaks the build.
|
||||
# Keep this package on the old Nixpkgs search order without restoring it
|
||||
# globally: https://github.com/NixOS/nixpkgs/pull/455592
|
||||
# CMake docs: https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_FRAMEWORK.html
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_FIND_FRAMEWORK=LAST"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Ballerburg";
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -21,16 +21,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bite";
|
||||
version = "0.3";
|
||||
version = "0.43";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WINSDK";
|
||||
repo = "bite";
|
||||
rev = "V${finalAttrs.version}";
|
||||
hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-akwkTV1bZJ3GcEtObyF+qN5IkBRoXdztUSOghjQy7A0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ESGX1hnDnU2taKQXre4AQRzQxTC7W+0cEIoQPPC9Lfs=";
|
||||
cargoHash = "sha256-OlxUHYTbljWGWdiceBmW3J0oB4w0/5izgNnwCafV6xY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -90,7 +92,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
description = "Disassembler focused on comprehensive rust support";
|
||||
homepage = "https://github.com/WINSDK/bite";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ vinnymeller ];
|
||||
maintainers = with lib.maintainers; [
|
||||
vinnymeller
|
||||
kybe236
|
||||
];
|
||||
mainProgram = "bite";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -70,11 +70,15 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
acl
|
||||
];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
msgpack
|
||||
packaging
|
||||
(if stdenv.hostPlatform.isLinux then pyfuse3 else llfuse)
|
||||
];
|
||||
dependencies =
|
||||
with python.pkgs;
|
||||
[
|
||||
msgpack
|
||||
packaging
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pyfuse3
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
''--prefix PATH ':' "${openssh}/bin"''
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "chess-tui";
|
||||
version = "2.5.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomas-mauran";
|
||||
repo = "chess-tui";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jO3pa4N7XNyKQCbPjFByYmLlOtrrdpzS5lkxU9giE+w=";
|
||||
hash = "sha256-BGJOPsePE5S5ySrOg63cNKn9pT+7MmDLHZrW3YhUFz8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9LXg4zX/irLt2MCq7V0dQA3o1QRqGgfRcX4HneNGAns=";
|
||||
cargoHash = "sha256-n9rjr5vUK619XIfuHIlf+lxUAeTbhTAzmdysliKNOFY=";
|
||||
|
||||
checkFlags = [
|
||||
# assertion failed: result.is_ok()
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppitertools";
|
||||
version = "2.1";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryanhaining";
|
||||
repo = "cppitertools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mii4xjxF1YC3H/TuO/o4cEz8bx2ko6U0eufqNVw5LNA=";
|
||||
hash = "sha256-1lHpy+9e17lP/58EEIzrmyBwbmMD665ypDJtkSFrN9E=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -25,13 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# tests. The CMake system defines tests and install targets, including a
|
||||
# cppitertools-config.cmake, which is really helpful for downstream consumers
|
||||
# to detect this package since it has no pkg-config.
|
||||
# However the CMake system also specifies the entire source repo as an install
|
||||
# target, including support files, the build directory, etc.
|
||||
# We can't simply take cppitertools-config.cmake for ourselves because before
|
||||
# install it's placed in non-specific private CMake subdirectory of the build
|
||||
# directory.
|
||||
# Therefore, we instead simply patch CMakeLists.txt to make the target that
|
||||
# installs the entire directory non-default, and then install the headers manually.
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -47,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# files that are also in that repo.
|
||||
cmakeBuildDir = "cmake-build";
|
||||
|
||||
includeInstallDir = "${placeholder "out"}/include/cppitertools";
|
||||
cmakeInstallDir = "${placeholder "out"}/share/cmake";
|
||||
|
||||
# This version of cppitertools considers itself as having used the default value,
|
||||
@@ -58,12 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [ "-Dcppitertools_INSTALL_CMAKE_DIR=${finalAttrs.cmakeInstallDir}" ];
|
||||
|
||||
prePatch = ''
|
||||
# Mark the `.` install target as non-default.
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail " DIRECTORY ." " DIRECTORY . EXCLUDE_FROM_ALL"
|
||||
''
|
||||
+ lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
prePatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
|
||||
# Required for tests.
|
||||
cp ${lib.getDev catch2}/include/catch2/catch.hpp test/
|
||||
'';
|
||||
@@ -77,11 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
# Install the -config.cmake files.
|
||||
cmake --install . "--prefix=$out"
|
||||
# Install the headers.
|
||||
mkdir -p "$includeInstallDir"
|
||||
cp -r ../*.hpp ../internal "$includeInstallDir"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -0,0 +1,193 @@
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -428,7 +428,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"itertools 0.13.0",
|
||||
@@ -454,9 +454,9 @@
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
-version = "2.10.0"
|
||||
+version = "2.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
|
||||
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
||||
|
||||
[[package]]
|
||||
name = "bitreader"
|
||||
@@ -555,7 +555,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"cairo-sys-rs",
|
||||
"glib",
|
||||
"libc",
|
||||
@@ -1132,20 +1132,20 @@
|
||||
|
||||
[[package]]
|
||||
name = "ffmpeg-next"
|
||||
-version = "8.0.0"
|
||||
+version = "8.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d658424d233cbd993a972dd73a66ca733acd12a494c68995c9ac32ae1fe65b40"
|
||||
+checksum = "f7c4bd5ab1ac61f29c634df1175d350ded29cf74c3c6d4f7030431a5ae3c7d5d"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"ffmpeg-sys-next",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ffmpeg-sys-next"
|
||||
-version = "8.0.1"
|
||||
+version = "8.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9bca20aa4ee774fe384c2490096c122b0b23cf524a9910add0686691003d797b"
|
||||
+checksum = "a314bc0e022a33a99567ed4bd2576bd58ffd8fcff7891c29194cfecc26a62547"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"cc",
|
||||
@@ -1709,7 +1709,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
"futures-executor",
|
||||
@@ -1796,7 +1796,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e9b31c7fa5ccb9d91317c956e767daef59be9fee3ae9df30468470368678482"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"gufo-common",
|
||||
"half",
|
||||
"memmap2",
|
||||
@@ -1816,7 +1816,7 @@
|
||||
checksum = "7dfec0cd29d5ecfb1dd723868e22e2c49441020f35d5f14307018ff0a1679e2f"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"blocking",
|
||||
"env_logger",
|
||||
"futures-util",
|
||||
@@ -2819,7 +2819,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -2829,7 +2829,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e5310a2c5b6ffbc094b5f70a2ca7b79ed36ad90e6f90994b166489a1bce3fcc"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"libc",
|
||||
"libseccomp-sys",
|
||||
"pkg-config",
|
||||
@@ -3190,7 +3190,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"libc",
|
||||
@@ -3422,7 +3422,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"cfg-if",
|
||||
"foreign-types 0.3.2",
|
||||
"libc",
|
||||
@@ -3631,7 +3631,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"crc32fast",
|
||||
"fdeflate",
|
||||
"flate2",
|
||||
@@ -3996,7 +3996,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4242,7 +4242,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"chrono",
|
||||
"fallible-iterator",
|
||||
"fallible-streaming-iterator",
|
||||
@@ -4323,7 +4323,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
@@ -4465,7 +4465,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"core-foundation 0.9.4",
|
||||
"core-foundation-sys",
|
||||
"libc",
|
||||
@@ -4478,7 +4478,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"core-foundation 0.10.1",
|
||||
"core-foundation-sys",
|
||||
"libc",
|
||||
@@ -4844,7 +4844,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"core-foundation 0.9.4",
|
||||
"system-configuration-sys 0.6.0",
|
||||
]
|
||||
@@ -5205,7 +5205,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
|
||||
dependencies = [
|
||||
- "bitflags 2.10.0",
|
||||
+ "bitflags 2.11.1",
|
||||
"bytes",
|
||||
"futures-util",
|
||||
"http 1.4.0",
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
applyPatches,
|
||||
clangStdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
@@ -40,9 +41,17 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-g1CxgK8gaX24TFnlGUons3ve8Ow9YaiMh1kMwlcP/F8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Bump ffmpeg-next 8.0.0 -> 8.1.0 in Cargo.lock for ffmpeg 8.1 compatibility.
|
||||
./cargo-lock-bump-ffmpeg-next.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-vA1vB2Lgyo5SfexDC4Ag85nM+/NzsYZNeIH4HmiESHc=";
|
||||
inherit (finalAttrs) pname version;
|
||||
src = applyPatches {
|
||||
inherit (finalAttrs) src patches;
|
||||
};
|
||||
hash = "sha256-AEZY1QODq4F+CTrJce14qA6XSZjv29wSwIqUjZPWJo4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -20,6 +20,11 @@ haskellPackages.mkDerivation {
|
||||
hash = "sha256-w4sWD5dZTNKwrYhrJw9RcwGoeNxpJnm/6RRqYjiIiBg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Hooky/Config.hs \
|
||||
--replace-fail 'KDL.text' 'KDL.string'
|
||||
'';
|
||||
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = with haskellPackages; [
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hot-resize";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberodark";
|
||||
repo = "hot-resize";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8UA5Wv96PUerBRTwTwkSAv1iw6lt9nd4MXGdKUmxoz4=";
|
||||
hash = "sha256-TMLtU2c5jkZEc14rII/+I1GtUzBnnZgPyPUgghqs7sM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uGMd9xZRYbCJyHkUZXvUnN3M5N1FTaROfoww+oODAHE=";
|
||||
cargoHash = "sha256-z9jWAGhSjYFQ8EhK0V4JsxToLYbEB4TJvhJJfUTGZS0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -43,6 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
}
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
gtk4-layer-shell,
|
||||
adwaita-icon-theme,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
pkg-config,
|
||||
hicolor-icon-theme,
|
||||
rustPlatform,
|
||||
@@ -33,16 +32,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ironbar";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakeStanger";
|
||||
repo = "ironbar";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vhkNdvzY9xd8qmKgKtpVRTdvmS1QxnGKDFCpttqX1GE=";
|
||||
hash = "sha256-9UPBSOgiyBOlUYZlx+xQN5PTPwDWCDdYKdCAhigzHwA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ptzq0407IaNrXXiksQKXDUbs2wPTz4GHtnCG49EbOcY=";
|
||||
cargoHash = "sha256-ticVPKKfQnz21LpegKDwAtizi7bavIPEmpXsrZdRN48=";
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
@@ -58,7 +57,6 @@ rustPlatform.buildRustPackage rec {
|
||||
systemd
|
||||
dbus
|
||||
]
|
||||
++ lib.optionals (hasFeature "http") [ openssl ]
|
||||
++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
|
||||
++ lib.optionals (hasFeature "cairo") [ luajit ]
|
||||
++ lib.optionals (hasFeature "keyboard") [
|
||||
|
||||
Generated
+121
@@ -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=";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -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";
|
||||
};
|
||||
})
|
||||
@@ -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
|
||||
''
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "labwc-tweaks-gtk";
|
||||
version = "0-unstable-2026-05-09";
|
||||
version = "0-unstable-2026-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labwc";
|
||||
repo = "labwc-tweaks-gtk";
|
||||
rev = "c84d78c601e9f9a6e863766e35f736635cfa52d0";
|
||||
hash = "sha256-qyMgo9QB8wLzZiUlbz/NjTssYy8FB28A5RX7Hd05ays=";
|
||||
rev = "ebe05bef2cf5966a45a42370371ae879c472cf6d";
|
||||
hash = "sha256-5HqxB03yXksRBV/wZa3J5xLEIbv2oZvLp2YQ3FMgd1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
glib,
|
||||
gtk2,
|
||||
popt,
|
||||
babeltrace,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lttv";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/packages/lttv-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with gcc14:
|
||||
(fetchpatch {
|
||||
name = "lttv-c99-compatibility-fix.patch";
|
||||
url = "https://git.lttng.org/?p=lttv.git;a=patch;h=6b9d59fe4cc1dc943501ab6ede93856b2f06c3ce";
|
||||
hash = "sha256-zcLHBri0i10NGkgiZT6QRZbixffYvkzLaFBeC/ESF/U=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk2
|
||||
popt
|
||||
babeltrace
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Graphical trace viewer for LTTng trace files";
|
||||
homepage = "https://lttng.org/";
|
||||
# liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
|
||||
# The rest of the LTTV package is distributed under the GNU GPL v2.
|
||||
license = with lib.licenses; [
|
||||
gpl2
|
||||
lgpl21
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
})
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: dnd.o:src/main.h:136: multiple definition of
|
||||
# `MENU_EXT'; main.o:src/main.h:136: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
NIX_CFLAGS_COMPILE = "-fcommon -std=gnu99";
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
};
|
||||
|
||||
|
||||
@@ -17,10 +17,7 @@ let
|
||||
Mailspring's sync engine runs locally, but its source is not open.
|
||||
'';
|
||||
mainProgram = "mailspring";
|
||||
maintainers = with lib.maintainers; [
|
||||
toschmidt
|
||||
wrench-exile-legacy
|
||||
];
|
||||
maintainers = with lib.maintainers; [ wrench-exile-legacy ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -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=";
|
||||
},
|
||||
...
|
||||
}:
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
let
|
||||
version = "0.5.3";
|
||||
version = "0.5.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
inherit version;
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "rust-lang";
|
||||
repo = "mdBook";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RMJQn58hshBGQSpu30NdUOb3Prywn6NfhauSzFZ35xQ=";
|
||||
hash = "sha256-gyjD47ZR9o2lIxipzesyJ6mxb9J9W+WS77TNWhKHP6U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LlImOjTQjMQURQ81Gn73v+DEHXqyyiz39K9T+MrE7S0=";
|
||||
cargoHash = "sha256-230KljOUSrDy8QCQki7jvJvdAsjVlUEjKDNVyTF4tWs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "3.210.0",
|
||||
"version": "3.211.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-eg7eO97SHZQoju/wH/6IvyEmLi//HXLsDJ3AjeJyPA8="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-5ke7ZXbqGAWcwUNW5ofrc0Ez7XS9oekHFuVagFeMwKA="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-J+2jHv3/QhpxOHoCMTJMr1k8TTQfQVYjPGuZeZ0GufQ="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-o9Hu5TqPzcOmbwAG40f6CDw5VE/3v3ggXJ6/2RPuReU="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
|
||||
"hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_mac_universal",
|
||||
"hash": "sha256-aOPjhsMAVP5Jn8pjxRyr/92HXlMB5nix9BwHoc2uf8A="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.210.0/mirrord_mac_universal",
|
||||
"hash": "sha256-GctpfiYZOfkYqbAmTWV+VHxbg4IGc/xhZvacgBltJnU="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.211.0/mirrord_mac_universal",
|
||||
"hash": "sha256-aOPjhsMAVP5Jn8pjxRyr/92HXlMB5nix9BwHoc2uf8A="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -4,18 +4,21 @@
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
libxcrypt-legacy,
|
||||
zlib,
|
||||
testers,
|
||||
nav,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nav";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jojo4GH/nav/releases/download/v${finalAttrs.version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz";
|
||||
sha256 =
|
||||
{
|
||||
x86_64-linux = "sha256-LQdw8/V1KFNM6TY1rFt/RiZuiRQXM+8HNGkJXDrE/mw=";
|
||||
aarch64-linux = "sha256-SMcdnUxKbJ5GXB358WglIMiPHWsn1uVnjN9UiL3V6dk=";
|
||||
x86_64-linux = "sha256-/A6IZRX8v8yKfcxYxo0gxbsZri2dgTs8YH7H2LauaBE=";
|
||||
aarch64-linux = "sha256-YNS/P6TU7qLPn39X6GyUtjBw7GXOi2btd3AV+etpUhQ=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
@@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
libxcrypt-legacy
|
||||
zlib
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -37,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = nav;
|
||||
};
|
||||
};
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -67,13 +67,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.71.3";
|
||||
version = "0.71.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1doOf/rgGbD/YtMY0+j1VM7933zR+G+Vyq6bF5fyuMg=";
|
||||
hash = "sha256-e/fe4wEjz7apA5RZ4nGIaunp0+5NVH4yMHK/l/MfcWI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "nwg-panel";
|
||||
version = "0.10.13";
|
||||
version = "0.10.15";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TfE2RjbCBoHcdp9st+HeVhSfTMahZdQaItOIuT8Sxcc=";
|
||||
hash = "sha256-zRoOsVnwn2DQctB9ZP0pAAnf9Ragd2RZGHZGN1KnMsQ=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
cudaSupport ? config.cudaSupport,
|
||||
ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
|
||||
rocmSupport ? config.rocmSupport,
|
||||
coremlSupport ? stdenv.hostPlatform.isDarwin,
|
||||
withFullProtobuf ? false,
|
||||
cudaPackages ? { },
|
||||
rocmPackages,
|
||||
@@ -80,6 +81,30 @@ let
|
||||
hash = "sha256-YqgzCyNywixebpHGx16tUuczmFS5pjCz5WjR89mv9eI=";
|
||||
};
|
||||
|
||||
coremltools-src = fetchFromGitHub {
|
||||
name = "coremltools-src";
|
||||
owner = "apple";
|
||||
repo = "coremltools";
|
||||
tag = "7.1";
|
||||
hash = "sha256-kajQFHpl+4UK6fp+rM8TP0GiqIFYXPVFc2x1p19rBSw=";
|
||||
};
|
||||
|
||||
fp16-src = fetchFromGitHub {
|
||||
name = "fp16-src";
|
||||
owner = "Maratyszcza";
|
||||
repo = "FP16";
|
||||
rev = "0a92994d729ff76a58f692d3028ca1b64b145d91";
|
||||
hash = "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=";
|
||||
};
|
||||
|
||||
psimd-src = fetchFromGitHub {
|
||||
name = "psimd-src";
|
||||
owner = "Maratyszcza";
|
||||
repo = "psimd";
|
||||
rev = "072586a71b55b7f8c584153d223e95687148a900";
|
||||
hash = "sha256-lV+VZi2b4SQlRYrhKx9Dxc6HlDEFz3newvcBjTekupo=";
|
||||
};
|
||||
|
||||
isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
@@ -263,6 +288,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
|
||||
(lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
|
||||
(lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport)
|
||||
(lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport)
|
||||
(lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
@@ -284,6 +310,12 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
# Incompatible with packaged version, far too slow to build vendored version
|
||||
(lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL" false)
|
||||
(lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
|
||||
]
|
||||
++ lib.optionals coremlSupport [
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_COREMLTOOLS" "${coremltools-src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FP16" "${fp16-src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PSIMD" "${psimd-src}")
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") # needed for psimd
|
||||
];
|
||||
|
||||
env =
|
||||
@@ -314,6 +346,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
!(
|
||||
cudaSupport
|
||||
|| rocmSupport
|
||||
|| coremlSupport
|
||||
# cross-compiled test binaries can't execute on the build platform
|
||||
|| (effectiveStdenv.hostPlatform != effectiveStdenv.buildPlatform)
|
||||
|| builtins.elem effectiveStdenv.buildPlatform.system [
|
||||
@@ -337,7 +370,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
install -m644 -Dt $out/include \
|
||||
../include/onnxruntime/core/framework/provider_options.h \
|
||||
../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \
|
||||
../include/onnxruntime/core/session/onnxruntime_*.h
|
||||
../include/onnxruntime/core/session/onnxruntime_*.h \
|
||||
../include/onnxruntime/core/providers/coreml/coreml_provider_factory.h
|
||||
'';
|
||||
|
||||
# See comments in `cudaPackages.nccl`
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pokefinder";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Admiral-Fish";
|
||||
repo = "PokeFinder";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tItPvA0f2HnY7SUSnb7A5jGwbRs7eQoS4vibBomZ9pw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-viObYX9W1bUzwGyf7rI1gQeB9OHlLfj5Uny0js/1f6M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -27,6 +27,32 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./set-desktop-file-name.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")' ""
|
||||
substituteInPlace Core/CMakeLists.txt \
|
||||
--replace-fail 'if (APPLE)' 'if (FALSE)'
|
||||
substituteInPlace Core/RNG/SHA1.cpp \
|
||||
--replace-fail '#include "SHA1.hpp"' '#include "SHA1.hpp"
|
||||
#include <algorithm>'
|
||||
|
||||
mkdir -p Core/Resources/compression
|
||||
touch Core/Resources/compression/__init__.py
|
||||
cat <<EOF > Core/Resources/compression/zstd.py
|
||||
import zstandard as zstd
|
||||
|
||||
def compress(data, level=3):
|
||||
cctx = zstd.ZstdCompressor(level=level)
|
||||
return cctx.compress(data)
|
||||
|
||||
def decompress(data):
|
||||
dctx = zstd.ZstdDecompressor()
|
||||
return dctx.decompress(data)
|
||||
EOF
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch "-flax-vector-conversions";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
''
|
||||
|
||||
@@ -1,96 +1,136 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
jre,
|
||||
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
|
||||
makeWrapper,
|
||||
|
||||
addDriverRunpath,
|
||||
alsa-lib,
|
||||
glfw3-minecraft,
|
||||
libGL,
|
||||
libjack2,
|
||||
libpulseaudio,
|
||||
libx11,
|
||||
libxext,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxrandr,
|
||||
libxxf86vm,
|
||||
libpulseaudio,
|
||||
libGL,
|
||||
glfw,
|
||||
openal,
|
||||
pipewire,
|
||||
udev,
|
||||
vulkan-loader,
|
||||
|
||||
textToSpeechSupport ? stdenv.hostPlatform.isLinux,
|
||||
flite,
|
||||
|
||||
pciutils,
|
||||
xrandr,
|
||||
|
||||
jdk25,
|
||||
jdk21,
|
||||
jdk17,
|
||||
jdk8,
|
||||
|
||||
# can be overriden to reduce the closure size
|
||||
jvms ? [
|
||||
jdk25
|
||||
jdk21
|
||||
jdk17
|
||||
jdk8
|
||||
],
|
||||
|
||||
additionalLibs ? [ ],
|
||||
additionalPrograms ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
# Copied from the `prismlauncher` package
|
||||
runtimeLibs = [
|
||||
# lwjgl
|
||||
libGL
|
||||
glfw
|
||||
openal
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
## native versions
|
||||
glfw3-minecraft
|
||||
openal
|
||||
|
||||
## openal
|
||||
alsa-lib
|
||||
libjack2
|
||||
libpulseaudio
|
||||
pipewire
|
||||
|
||||
## glfw
|
||||
libGL
|
||||
libx11
|
||||
libxext
|
||||
libxcursor
|
||||
libxext
|
||||
libxrandr
|
||||
libxxf86vm
|
||||
|
||||
# lwjgl
|
||||
libpulseaudio
|
||||
udev # oshi
|
||||
|
||||
# oshi
|
||||
udev
|
||||
vulkan-loader # VulkanMod's lwjgl
|
||||
]
|
||||
++ lib.optional textToSpeechSupport flite;
|
||||
++ lib.optional textToSpeechSupport flite
|
||||
++ additionalLibs;
|
||||
|
||||
# Copied from the `prismlauncher` package
|
||||
runtimePrograms = [
|
||||
pciutils # need lspci
|
||||
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||
]
|
||||
++ additionalPrograms;
|
||||
|
||||
in
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "portablemc";
|
||||
version = "4.4.1";
|
||||
pyproject = true;
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theorzr";
|
||||
repo = "portablemc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KE1qf6aIcDjwKzrdKDUmriWfAt+vuriew6ixHKm0xs8=";
|
||||
hash = "sha256-P/ah7pwOdbgRDgpvhEDcNA1RiDzG2nYZCR13vzljLd8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use the jre package provided by nixpkgs by default
|
||||
./use-builtin-java.patch
|
||||
];
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-Ub9XVc6gcu6fEiOheew9Uh3LqdaSzVKITboDTK+MQUI=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
unwrapped = rustPlatform.buildRustPackage {
|
||||
name = "portablemc-${finalAttrs.version}-unwrapped";
|
||||
inherit (finalAttrs) src cargoDeps;
|
||||
|
||||
dependencies = [ python3Packages.certifi ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# Note: Tests use networking, so we don't run them
|
||||
buildInputs = [ openssl ];
|
||||
};
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd portablemc \
|
||||
--bash <($out/bin/portablemc show completion bash) \
|
||||
--zsh <($out/bin/portablemc show completion zsh)
|
||||
'';
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs}
|
||||
--prefix PATH : ${lib.makeBinPath [ jre ]}
|
||||
)
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
makeWrapper "$unwrapped/bin/portablemc" "$out/bin/portablemc" \
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
--prefix LD_LIBRARY_PATH : "${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" \
|
||||
--prefix PATH : "${lib.makeBinPath runtimePrograms}" \
|
||||
''} \
|
||||
--prefix PATH : ${lib.makeBinPath jvms}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/theorzr/portablemc";
|
||||
description = "Fast, reliable and cross-platform command-line Minecraft launcher and API for developers";
|
||||
longDescription = ''
|
||||
A fast, reliable and cross-platform command-line Minecraft launcher and API for developers.
|
||||
Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt.
|
||||
This launcher is compatible with the standard Minecraft directories.
|
||||
'';
|
||||
description = "Cross platform command line utility for launching Minecraft quickly and reliably with included support for Mojang versions and popular mod loaders";
|
||||
changelog = "https://github.com/theorzr/portablemc/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "portablemc";
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
diff --git a/portablemc/standard.py b/portablemc/standard.py
|
||||
index f59c55d..0f017e1 100644
|
||||
--- a/portablemc/standard.py
|
||||
+++ b/portablemc/standard.py
|
||||
@@ -843,6 +843,8 @@ class Version:
|
||||
if jvm_major_version is not None and not isinstance(jvm_major_version, int):
|
||||
raise ValueError("metadata: /javaVersion/majorVersion must be an integer")
|
||||
|
||||
+ return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_ARCH, jvm_major_version)
|
||||
+
|
||||
if platform.system() == "Linux" and platform.libc_ver()[0] != "glibc":
|
||||
return self._resolve_builtin_jvm(watcher, JvmNotFoundError.UNSUPPORTED_LIBC, jvm_major_version)
|
||||
|
||||
@@ -926,31 +928,10 @@ class Version:
|
||||
builtin_path = shutil.which(jvm_bin_filename)
|
||||
if builtin_path is None:
|
||||
raise JvmNotFoundError(reason)
|
||||
-
|
||||
- try:
|
||||
-
|
||||
- # Get version of the JVM.
|
||||
- process = Popen([builtin_path, "-version"], bufsize=1, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
|
||||
- stdout, _stderr = process.communicate(timeout=1)
|
||||
-
|
||||
- version_start = stdout.index(f"1.{major_version}" if major_version <= 8 else str(major_version))
|
||||
- version = None
|
||||
-
|
||||
- # Parse version by getting all character that are numeric or '.'.
|
||||
- for i, ch in enumerate(stdout[version_start:]):
|
||||
- if not ch.isnumeric() and ch not in (".", "_"):
|
||||
- version = stdout[version_start:i]
|
||||
- break
|
||||
-
|
||||
- if version is None:
|
||||
- raise ValueError()
|
||||
-
|
||||
- except (TimeoutExpired, ValueError):
|
||||
- raise JvmNotFoundError(JvmNotFoundError.BUILTIN_INVALID_VERSION)
|
||||
|
||||
self._jvm_path = Path(builtin_path)
|
||||
- self._jvm_version = version
|
||||
- watcher.handle(JvmLoadedEvent(version, JvmLoadedEvent.BUILTIN))
|
||||
+ self._jvm_version = "nixpkgs"
|
||||
+ watcher.handle(JvmLoadedEvent("nixpkgs", JvmLoadedEvent.BUILTIN))
|
||||
|
||||
def _download(self, watcher: Watcher) -> None:
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "praat";
|
||||
version = "6.4.63";
|
||||
version = "6.4.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat.github.io";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-96fw5WRk1/zex65hcRdmx0wq2FTVett3FRDPhmsZr6g=";
|
||||
hash = "sha256-v4cAFLSJllrNgTm6ewR40HYvdi8a1bZcEBz/BTdFsxA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -44,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cp makefiles/makefile.defs.linux.pulse-gcc.${
|
||||
if stdenv.hostPlatform.isLittleEndian then "LE" else "BE"
|
||||
} makefile.defs
|
||||
cp makefiles/makefile.defs.linux.pulse-gcc makefile.defs
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
typescript,
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "qui";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "qui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rdg8fcoUY7WrNXj+LZyMXx6hFo8+OGrCLjhE3JD1y4o=";
|
||||
hash = "sha256-h6GmxwOxqh88Zy7tFD/GFQ8NrpBcanFPBXGUmfoIe3I=";
|
||||
};
|
||||
|
||||
qui-web = stdenvNoCC.mkDerivation (finalAttrs': {
|
||||
@@ -29,7 +29,7 @@ buildGo126Module (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
typescript
|
||||
];
|
||||
|
||||
@@ -42,9 +42,9 @@ buildGo126Module (finalAttrs: {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-hCiIbVroyMhl2xT0WAGbmLSXfUH6RJHlC1g3isMlUJs=";
|
||||
hash = "sha256-OEr5uyMnwP1TkSxRFNaopB9AAx2OVE7lNEzGyQwF6kc=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: {
|
||||
'';
|
||||
});
|
||||
|
||||
vendorHash = "sha256-7MzKE3pBvoW/ajB6gHtBBS1M/NuQsRw3ZSNtCJzrEyI=";
|
||||
vendorHash = "sha256-pkktl+0dBSbUuxZ1ycTV0HZl/wO79LtmNaamyZ+Z9lY=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.qui-web}/* web/dist
|
||||
|
||||
@@ -14,17 +14,17 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "qwen-code";
|
||||
version = "0.15.11";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QwenLM";
|
||||
repo = "qwen-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6ArEbnJOAKexoSy7Epis5OC8XYmmQpZPILtUEv4E0k4=";
|
||||
hash = "sha256-XWhQ5GlAGW0WAyiPwBULLz1yQps2IdjVkusQ0a88tCs=";
|
||||
};
|
||||
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-J/dvHeC38uiZKgB6mGAnlCbAKXdai/mMzdP1E1Pa6Yg=";
|
||||
npmDepsHash = "sha256-dRc+hTk5ELw0rJhT71heFnLjTmjN1UpIOHUMXKt4YwU=";
|
||||
|
||||
# npm 11 incompatible with fetchNpmDeps
|
||||
# https://github.com/NixOS/nixpkgs/issues/474535
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "roave-backward-compatibility-check";
|
||||
version = "8.20.0";
|
||||
version = "8.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roave";
|
||||
repo = "BackwardCompatibilityCheck";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-skLTpDak2mgltZpDrNLQXw00omLW/xW5hBPNuX/noSc=";
|
||||
hash = "sha256-kCs9lDvbhUacOH4bEAZjm2LzHSvJnVMR9lzmt00GgTw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-v8Wv5BK9r3zYst1P0AcpkYCcl0iBvWt+UL2+fEF8Ahw=";
|
||||
vendorHash = "sha256-68KE/ieWYST/jQMaaK5lLqBLEmI4YhYPOE4XuXNMfqM=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rtk";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtk-ai";
|
||||
repo = "rtk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xWHIOZRpSyyOPQe/db9dxoODcnheBlpXrnKET010vVg=";
|
||||
hash = "sha256-C8ns53qLpBdb5osdX68UBGMqM2Rs5UJyfal/iDns6a4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DJazpSx1FCt9pjFjqsoL3MLEQLdFvLwEj3UsP0aYHmc=";
|
||||
cargoHash = "sha256-gDkXAiW8ajEpsEBb7KT9MO5fPEWyUqS+2ak34cipPdc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "samrewritten";
|
||||
version = "1.2.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaulCombal";
|
||||
repo = "SamRewritten";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UHq09i0f7tLgAMIEA+GrLqKxzdsFmUrp3iIGAM+MXJ0=";
|
||||
hash = "sha256-5SXek64kccyUs+vSyA8QCX+UpRSm0aDEZwULYZgmIUw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jPCF+wIb+DESph5dtF80NV7ydxWm09BQyf4eO2BKmNI=";
|
||||
cargoHash = "sha256-sL6kIkYWnD7QKw/RGMDS9ZZK/LcKtYjFr5pQ6758IuQ=";
|
||||
|
||||
# Tests require network access and a running Steam client. Skipping.
|
||||
doCheck = false;
|
||||
|
||||
@@ -191,6 +191,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export DYLD_FALLBACK_LIBRARY_PATH=${lib.getLib onnxruntime}/lib
|
||||
'';
|
||||
|
||||
# Use ctest directly because the default `make check` target includes clang-tidy.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
@@ -202,6 +206,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p $python
|
||||
cp -r ../sherpa-onnx/python/sherpa_onnx $python/
|
||||
rm $out/lib/_sherpa_onnx*.so
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -add_rpath ${lib.getLib onnxruntime}/lib \
|
||||
$python/sherpa_onnx/lib/_sherpa_onnx*.so
|
||||
''}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--- a/src/util.h
|
||||
+++ b/src/util.h
|
||||
@@ -58,6 +58,12 @@
|
||||
char *
|
||||
sng_basename(const char *name);
|
||||
|
||||
+/**
|
||||
+ * @brief Wrapper for strncpy
|
||||
+ */
|
||||
+char *
|
||||
+sng_strncpy(char *dst, const char *src, size_t len);
|
||||
+
|
||||
/**
|
||||
* @brief Compare two timeval structures
|
||||
*
|
||||
@@ -4,32 +4,35 @@
|
||||
autoconf,
|
||||
automake,
|
||||
fetchFromGitHub,
|
||||
libgcrypt,
|
||||
libpcap,
|
||||
ncurses,
|
||||
openssl,
|
||||
pcre,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sngrep";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irontec";
|
||||
repo = "sngrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE=";
|
||||
hash = "sha256-4DLbQ3OOMvJw37n3jVuztG49HlPbWrfxByi6g6AvELQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libpcap
|
||||
ncurses
|
||||
ncurses
|
||||
openssl
|
||||
pcre
|
||||
];
|
||||
@@ -42,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-openssl"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-sng_strncpy-declaration.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "solanum";
|
||||
version = "0-unstable-2026-05-13";
|
||||
version = "0-unstable-2026-05-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solanum-ircd";
|
||||
repo = "solanum";
|
||||
rev = "8cbf75cc728f99224fe0f2fa86689db07a317ea9";
|
||||
hash = "sha256-6+EkYOgiQo6mD7O7Id74WTRJ4FtBie1/i+SBj+g7su8=";
|
||||
rev = "dfe6757a577109d2180465da6270b5a6bc08f8d7";
|
||||
hash = "sha256-ngg/0HPZeCYodIWt8p9zpCj6hQMiVoc9E2cm/87eE8k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
stdenv,
|
||||
dpkg,
|
||||
fetchurl,
|
||||
procps,
|
||||
net-tools,
|
||||
libgcc,
|
||||
libnetfilter_conntrack,
|
||||
autoPatchelfHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "speedify";
|
||||
version = "15.8.2-12611";
|
||||
# Find latest version within https://apt.connectify.me/dists/speedify/main/binary-amd64/Packages.gz
|
||||
version = "16.7.0-12928";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://apt.connectify.me/pool/main/s/speedify/speedify_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-61GQZkXBe3EQpOUODpL60SCHJO0FGqvpL9xFn+q+kPs=";
|
||||
hash = "sha256-A77LYBGLAgoRFV64/ZmpTL76NQx6xHq0a7leDYi9Izg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -22,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
procps
|
||||
net-tools
|
||||
libgcc
|
||||
libnetfilter_conntrack
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "starlark";
|
||||
version = "0-unstable-2026-03-26";
|
||||
version = "0-unstable-2026-05-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "starlark-go";
|
||||
rev = "fadfc96def35ea95e7f2bd9952256d4db1d80d91";
|
||||
hash = "sha256-t+7QUORMlRCA1lLhekPrR3ag7hmX++DrSOBQunTMLFM=";
|
||||
rev = "ec58d4b459e2866ed51124596d888ed7aa4f90b8";
|
||||
hash = "sha256-9H0TIp2CIGo5Rqld9Xvsg/uQmfswiUzSsu7vwazjcho=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE=";
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
}:
|
||||
let
|
||||
# We have to hardcode revision because upstream often create multiple releases for the same version number.
|
||||
# This is the commit hash that maps to 1.5.0-beta.13 released on 2025-12-30
|
||||
rev = "359de976eb23120d6e6a2d31104e15b37d1edfeb";
|
||||
# This is the commit hash that maps to 1.5.0-beta.14 released on 2026-5-21
|
||||
rev = "12052dec15d0e0948032c7ec11eff2da0d109106";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "streamcontroller";
|
||||
|
||||
version = "1.5.0-beta.13";
|
||||
version = "1.5.0-beta.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "StreamController";
|
||||
owner = "StreamController";
|
||||
inherit rev;
|
||||
hash = "sha256-b5tRhXEQGRhaJd1Q/hlmqUTO+0F+3+lziYSi8QpUa9c=";
|
||||
hash = "sha256-JGJc7bj58oZwvtExSv+tv7Ug84RYdEkcMBI3ZmqpaKY=";
|
||||
};
|
||||
|
||||
# The installation method documented upstream
|
||||
@@ -200,7 +200,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Elegant Linux app for the Elgato Stream Deck with support for plugins";
|
||||
homepage = "https://core447.com/";
|
||||
homepage = "https://streamcontroller.core447.com/";
|
||||
license = lib.licenses.gpl3;
|
||||
mainProgram = "streamcontroller";
|
||||
maintainers = with lib.maintainers; [ sifmelcara ];
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -12,16 +12,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "updatecli";
|
||||
version = "0.116.3";
|
||||
version = "0.117.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "updatecli";
|
||||
repo = "updatecli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5dJfbw0xoB34XuCym/TcqwdeUORZezfJNu7Plt82VPM=";
|
||||
hash = "sha256-9nA+sOlcIm5Try0oag1Oz/ALPDaMag0jZKzHrS0Brf8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cMXepPUJoJGRlQSRSByA2/pjsQXfyH8Va320CywxxDw=";
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-8WPwZjoDbRDi1IbjdZ40796JA5PRh8T75wRlWgTF7dI=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.11.15";
|
||||
version = "0.11.16";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Nwf7DSxXG5F515LW19q+2VpXtdVLUWx2sMQr35lvsgk=";
|
||||
hash = "sha256-5LJspcHj/RjOMv7eRB7n+tofX4s51M3kqHCPymCg90A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PWkDAl6jkpZBz19mz4ZQmiA/RvgFC0KOftXQtZ0SFdk=";
|
||||
cargoHash = "sha256-2lg86WxPGVbJ91zi61lKrSqnzFgmmSrBrl+SfV5SJWU=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user