Merge master into staging-next
This commit is contained in:
@@ -726,13 +726,11 @@
|
||||
"id": 13362067,
|
||||
"maintainers": {
|
||||
"philiptaron": 43863,
|
||||
"wolfgangwalther": 9132420
|
||||
},
|
||||
"members": {
|
||||
"MattSturgeon": 5046562,
|
||||
"Mic92": 96200,
|
||||
"zowoq": 59103226
|
||||
},
|
||||
"members": {},
|
||||
"name": "Nixpkgs CI"
|
||||
},
|
||||
"nixpkgs-core": {
|
||||
|
||||
@@ -198,6 +198,8 @@
|
||||
|
||||
- [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable).
|
||||
|
||||
- [rumno](https://gitlab.com/ivanmalison/rumno), a visual pop-up notification manager. Available as [services.rumno](#opt-services.rumno.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -20,7 +20,20 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
|
||||
package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead
|
||||
of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.kubernetes.addons.dns.corednsImage = pkgs.dockerTools.pullImage {
|
||||
imageName = "coredns/coredns";
|
||||
imageDigest = "sha256:af8c8d35a5d184b386c4a6d1a012c8b218d40d1376474c7d071bb6c07201f47d";
|
||||
finalImageTag = "v1.12.2";
|
||||
hash = "sha256-ZgXEyxVrdskQdgg0ONJ9sboAXEEHTgNsiptk5O945c0=";
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
## Other Notable Changes {#sec-release-26.05-notable-changes}
|
||||
|
||||
|
||||
@@ -931,6 +931,7 @@
|
||||
./services/misc/rmfakecloud.nix
|
||||
./services/misc/rshim.nix
|
||||
./services/misc/rsync.nix
|
||||
./services/misc/rumno.nix
|
||||
./services/misc/safeeyes.nix
|
||||
./services/misc/sdrplay.nix
|
||||
./services/misc/servarr/lidarr.nix
|
||||
@@ -1522,6 +1523,7 @@
|
||||
./services/system/earlyoom.nix
|
||||
./services/system/kerberos/default.nix
|
||||
./services/system/localtimed.nix
|
||||
./services/system/nix-daemon-firewall.nix
|
||||
./services/system/nix-daemon.nix
|
||||
./services/system/nscd.nix
|
||||
./services/system/nvme-rs.nix
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
version = "1.10.1";
|
||||
cfg = config.services.kubernetes.addons.dns;
|
||||
ports = {
|
||||
dns = 10053;
|
||||
@@ -15,6 +14,26 @@ let
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModuleWith {
|
||||
sinceRelease = 2605;
|
||||
from = [
|
||||
"services"
|
||||
"kubernetes"
|
||||
"addons"
|
||||
"dns"
|
||||
"coredns"
|
||||
];
|
||||
to = [
|
||||
"services"
|
||||
"kubernetes"
|
||||
"addons"
|
||||
"dns"
|
||||
"corednsImage"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
options.services.kubernetes.addons.dns = {
|
||||
enable = lib.mkEnableOption "kubernetes dns addon";
|
||||
|
||||
@@ -61,14 +80,12 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
coredns = lib.mkOption {
|
||||
corednsImage = lib.mkOption {
|
||||
description = "Docker image to seed for the CoreDNS container.";
|
||||
type = lib.types.attrs;
|
||||
default = {
|
||||
imageName = "coredns/coredns";
|
||||
imageDigest = "sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e";
|
||||
finalImageTag = version;
|
||||
sha256 = "0wg696920smmal7552a2zdhfncndn5kfammfa8bk8l7dz9bhk0y1";
|
||||
type = lib.types.package;
|
||||
default = pkgs.dockerTools.buildImage {
|
||||
name = "coredns";
|
||||
config.Entrypoint = [ "${pkgs.coredns}/bin/coredns" ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -116,9 +133,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.kubernetes.kubelet.seedDockerImages = lib.singleton (
|
||||
pkgs.dockerTools.pullImage cfg.coredns
|
||||
);
|
||||
services.kubernetes.kubelet.seedDockerImages = lib.singleton (cfg.corednsImage);
|
||||
|
||||
services.kubernetes.addonManager.bootstrapAddons = {
|
||||
coredns-cr = {
|
||||
@@ -264,7 +279,7 @@ in
|
||||
"-conf"
|
||||
"/etc/coredns/Corefile"
|
||||
];
|
||||
image = with cfg.coredns; "${imageName}:${finalImageTag}";
|
||||
image = with cfg.corednsImage; "${imageName}:${imageTag}";
|
||||
imagePullPolicy = "Never";
|
||||
livenessProbe = {
|
||||
failureThreshold = 5;
|
||||
@@ -307,6 +322,7 @@ in
|
||||
securityContext = {
|
||||
allowPrivilegeEscalation = false;
|
||||
capabilities = {
|
||||
add = [ "NET_BIND_SERVICE" ];
|
||||
drop = [ "all" ];
|
||||
};
|
||||
readOnlyRootFilesystem = true;
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.rumno;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ imalison ];
|
||||
|
||||
options.services.rumno = {
|
||||
enable = lib.mkEnableOption "rumno visual pop-up notification manager";
|
||||
|
||||
package = lib.mkPackageOption pkgs "rumno" { };
|
||||
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--verbose"
|
||||
"--config"
|
||||
"/etc/rumno/config.toml"
|
||||
];
|
||||
description = ''
|
||||
Extra command-line arguments to pass to the rumno daemon.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.user.services.rumno = {
|
||||
description = "Rumno visual pop-up notification manager";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
after = [ "graphical-session-pre.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "dbus";
|
||||
BusName = "de.rumno.v1";
|
||||
ExecStart = "${cfg.package}/bin/rumno daemon --foreground ${lib.escapeShellArgs cfg.extraArgs}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
|
||||
# Environment for GTK/GUI applications
|
||||
PassEnvironment = [
|
||||
"DISPLAY"
|
||||
"WAYLAND_DISPLAY"
|
||||
"XDG_RUNTIME_DIR"
|
||||
];
|
||||
};
|
||||
|
||||
environment = {
|
||||
# Set GTK theme environment variables if needed
|
||||
GTK_THEME = lib.mkDefault "";
|
||||
};
|
||||
};
|
||||
|
||||
# Ensure dbus service file is installed
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
@@ -43,6 +43,17 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
environmentFiles = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
description = ''
|
||||
List of paths files that follows systemd environmentfile structure.
|
||||
Can be used to pass secrets to settings attribute.
|
||||
|
||||
Example content of a file: SECRET_TOKEN=1234
|
||||
'';
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = settingsFormat.type;
|
||||
default = { };
|
||||
@@ -100,6 +111,7 @@ in
|
||||
RestartSec = 15;
|
||||
ExecStart = "${cfg.package}/bin/${executableFile} --strict_config -c ${configFile}";
|
||||
DynamicUser = true;
|
||||
EnvironmentFile = options.environmentFiles;
|
||||
# Hardening
|
||||
CapabilityBoundingSet = serviceCapability;
|
||||
AmbientCapabilities = serviceCapability;
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
|
||||
cfg = config.nix.firewall;
|
||||
|
||||
in
|
||||
{
|
||||
options.nix.firewall = {
|
||||
enable = lib.mkEnableOption "firewalling for outgoing traffic of the nix daemon";
|
||||
|
||||
allowLoopback = lib.mkOption {
|
||||
description = "Whether to allow traffic on the loopback interface. Traffic is still subject to protocol/port rules";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
|
||||
allowPrivateNetworks = lib.mkOption {
|
||||
description = "Whether to allow traffic to local networks. Traffic is still subject to protocol/port rules. Note that this option may break DNS resolution when the DNS resolver is in a local network";
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
|
||||
allowNonTCPUDP = lib.mkOption {
|
||||
description = "Whether to allow traffic that is neither TCP nor UDP";
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
|
||||
allowedTCPPorts = lib.mkOption {
|
||||
description = "TCP ports to which traffic is allowed. Specifying no ports will allow all TCP traffic";
|
||||
type = lib.types.listOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.singleLineStr
|
||||
lib.types.port
|
||||
]
|
||||
);
|
||||
default = [ ];
|
||||
example = [
|
||||
"http"
|
||||
443
|
||||
"30000-31000"
|
||||
];
|
||||
};
|
||||
|
||||
allowedUDPPorts = lib.mkOption {
|
||||
description = "UDP ports to which traffic is allowed. Specifying no ports will allow all UDP traffic";
|
||||
type = lib.types.listOf (
|
||||
lib.types.oneOf [
|
||||
lib.types.singleLineStr
|
||||
lib.types.port
|
||||
]
|
||||
);
|
||||
default = [ ];
|
||||
example = [ 53 ];
|
||||
};
|
||||
|
||||
extraNftablesRules = lib.mkOption {
|
||||
description = "Extra nftables rules to prepend to the generated ones";
|
||||
type = lib.types.listOf lib.types.singleLineStr;
|
||||
default = [ ];
|
||||
example = [ "ip daddr 1.1.1.1 udp dport accept" ];
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Ensure we can properly use nftables
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.networking.nftables.enable;
|
||||
message = ''
|
||||
The nix-daemon firewall requires an nftables-based firewall.
|
||||
networking.nftables.enable must be set to true.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !config.networking.nftables.flushRuleset;
|
||||
message = ''
|
||||
The nix-daemon firewall writes extra tables to nftables.
|
||||
networking.nftables.flushRuleset must be set to false.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.nix-daemon = {
|
||||
after = [ "nftables.service" ];
|
||||
# Add the cgroup ID to a nft set on daemon start
|
||||
serviceConfig.NFTSet = "cgroup:inet:nix_daemon_firewall:nix_daemon";
|
||||
};
|
||||
|
||||
# Generate nftables rules
|
||||
networking.nftables.ruleset = ''
|
||||
table inet nix_daemon_firewall {
|
||||
set nix_daemon {
|
||||
type cgroupsv2
|
||||
}
|
||||
chain output {
|
||||
type filter hook output priority 0;
|
||||
socket cgroupv2 level 2 @nix_daemon goto nix_daemon_traffic
|
||||
accept
|
||||
}
|
||||
chain nix_daemon_traffic {
|
||||
# Extra rules
|
||||
${lib.concatStringsSep "\n" cfg.extraNftablesRules}
|
||||
|
||||
# Loopback
|
||||
${lib.optionalString (!cfg.allowLoopback) "ip daddr 127.0.0.0/8 counter drop"}
|
||||
${lib.optionalString (!cfg.allowLoopback) "ip6 daddr ::1 counter drop"}
|
||||
|
||||
# Local networks
|
||||
${lib.optionalString (
|
||||
!cfg.allowPrivateNetworks
|
||||
) "ip daddr { 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16 } counter drop"}
|
||||
${lib.optionalString (
|
||||
!cfg.allowPrivateNetworks
|
||||
) "ip6 daddr { fd00::/8, fe80::/10 } counter drop"}
|
||||
|
||||
# TCP
|
||||
${lib.optionalString (cfg.allowedTCPPorts != [ ]) ''
|
||||
tcp dport { ${lib.concatStringsSep ", " (map builtins.toString cfg.allowedTCPPorts)} } accept
|
||||
ip protocol tcp counter drop
|
||||
ip6 nexthdr tcp counter drop
|
||||
''}
|
||||
|
||||
# UDP
|
||||
${lib.optionalString (cfg.allowedUDPPorts != [ ]) ''
|
||||
udp dport { ${lib.concatStringsSep ", " (map builtins.toString cfg.allowedUDPPorts)} } accept
|
||||
ip protocol udp counter drop
|
||||
ip6 nexthdr udp counter drop
|
||||
''}
|
||||
|
||||
# Non-TCP and non-UDP
|
||||
${lib.optionalString (!cfg.allowNonTCPUDP) "ip protocol != { tcp, udp } counter drop"}
|
||||
${lib.optionalString (!cfg.allowNonTCPUDP) "ip6 nexthdr != { tcp, udp } counter drop"}
|
||||
|
||||
accept
|
||||
}
|
||||
}
|
||||
'';
|
||||
# Not supported by LKL yet so the ruleset check would fail
|
||||
networking.nftables.preCheckRuleset = ''
|
||||
sed -i 's/socket cgroupv2 level 2 @nix_daemon//g' ruleset.conf
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -213,6 +213,10 @@ in
|
||||
|
||||
networking.resolvconf.package = pkgs.systemd;
|
||||
|
||||
nix.firewall.extraNftablesRules = [
|
||||
"ip daddr { 127.0.0.53, 127.0.0.54 } udp dport 53 accept comment \"systemd-resolved listening IPs\""
|
||||
];
|
||||
|
||||
})
|
||||
|
||||
(mkIf config.boot.initrd.services.resolved.enable {
|
||||
|
||||
@@ -1069,6 +1069,7 @@ in
|
||||
nitter = runTest ./nitter.nix;
|
||||
nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
|
||||
nix-config = runTest ./nix-config.nix;
|
||||
nix-daemon-firewall = runTest ./nix-daemon-firewall.nix;
|
||||
nix-ld = runTest ./nix-ld.nix;
|
||||
nix-misc = handleTest ./nix/misc.nix { };
|
||||
nix-required-mounts = runTest ./nix-required-mounts;
|
||||
|
||||
+23
-4
@@ -1,4 +1,15 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
token = "1234";
|
||||
dummyFile = pkgs.writeTextFile {
|
||||
name = "secrets";
|
||||
text = "dummy=value";
|
||||
};
|
||||
secretFile = pkgs.writeTextFile {
|
||||
name = "secrets";
|
||||
text = "token=${token}";
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "frp";
|
||||
meta.maintainers = with lib.maintainers; [ zaldnoay ];
|
||||
@@ -15,12 +26,18 @@
|
||||
networkConfig.Address = "10.0.0.1/24";
|
||||
};
|
||||
|
||||
services.frp = {
|
||||
services.frp.instances.server = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
environmentFiles = [
|
||||
(builtins.toPath dummyFile)
|
||||
(builtins.toPath secretFile)
|
||||
];
|
||||
settings = {
|
||||
bindPort = 7000;
|
||||
vhostHTTPPort = 80;
|
||||
auth.method = "token";
|
||||
auth.token = "{{ .Envs.token }}";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -53,12 +70,14 @@
|
||||
enablePHP = true;
|
||||
};
|
||||
|
||||
services.frp = {
|
||||
services.frp.instances.client = {
|
||||
enable = true;
|
||||
role = "client";
|
||||
settings = {
|
||||
serverAddr = "10.0.0.1";
|
||||
serverPort = 7000;
|
||||
auth.method = "token";
|
||||
auth.token = token;
|
||||
proxies = [
|
||||
{
|
||||
name = "web";
|
||||
@@ -74,9 +93,9 @@
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
frps.wait_for_unit("frp.service")
|
||||
frps.wait_for_unit("frp-server.service")
|
||||
frps.wait_for_open_port(80)
|
||||
frpc.wait_for_unit("frp.service")
|
||||
frpc.wait_for_unit("frp-client.service")
|
||||
response = frpc.succeed("curl -fvvv -s http://127.0.0.1/")
|
||||
assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
|
||||
response = frpc.succeed("curl -fvvv -s http://10.0.0.1/")
|
||||
|
||||
@@ -0,0 +1,238 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
# Hashes for the test files we serve. We have multiple of them to force nix
|
||||
# to download the files instead of using the already-downloaded variant
|
||||
hashes = {
|
||||
a = "sha256-ypeBEsobvcr6wjGzmiPcTaeG7/gUfE5yuYB3ha/uSLs=";
|
||||
b = "sha256-PiPoFgA5WUoziU9lZOGxNIu9egCI1CxKy3PurtWcAJ0=";
|
||||
c = "sha256-Ln0sA6lQeuJl7PW1NWiFpTOTogKdJBOUmXJloaJa78Y=";
|
||||
};
|
||||
|
||||
# Builds a .nix file that can download a file from the test server
|
||||
mkFetcher =
|
||||
{
|
||||
name,
|
||||
url,
|
||||
hash,
|
||||
}:
|
||||
pkgs.writeText "${name}.nix" ''
|
||||
derivation {
|
||||
name = "${name}-fetch";
|
||||
builder = "builtin:fetchurl";
|
||||
system = "builtin";
|
||||
preferLocalBuild = true;
|
||||
|
||||
url = "${url}";
|
||||
outputHash = "${hash}";
|
||||
outputHashMode = "flat";
|
||||
}
|
||||
'';
|
||||
|
||||
# Fetches a file from the public IP, port 80
|
||||
publicFetcher = mkFetcher {
|
||||
name = "public";
|
||||
url = "http://1.0.0.1/a";
|
||||
hash = hashes.a;
|
||||
};
|
||||
|
||||
# Fetches a file from the private IP, port 80
|
||||
privateFetcher = mkFetcher {
|
||||
name = "private";
|
||||
url = "http://192.168.0.1/b";
|
||||
hash = hashes.b;
|
||||
};
|
||||
|
||||
# Fetches a file from the public IP, port 81
|
||||
publicFetcherOtherPort = mkFetcher {
|
||||
name = "public";
|
||||
url = "http://192.168.0.1:81/c";
|
||||
hash = hashes.c;
|
||||
};
|
||||
|
||||
# Fetches a file from localhost
|
||||
localhostFetcher = mkFetcher {
|
||||
name = "localhost";
|
||||
url = "http://127.0.0.1/a";
|
||||
hash = hashes.a;
|
||||
};
|
||||
|
||||
# Generates a file but tries to resolve via DNS first
|
||||
resolver = pkgs.writeText "pinger.nix" ''
|
||||
derivation {
|
||||
name = "resolver";
|
||||
|
||||
system = builtins.currentSystem;
|
||||
preferLocalBuild = true;
|
||||
|
||||
builder = "/bin/sh";
|
||||
args = [ "-c" "${pkgs.pkgsStatic.busybox}/bin/nslookup . && echo hello > $out" ];
|
||||
|
||||
outputHash = "sha256-WJG1tSLV3whtD/CxEPvZ0hu0/HFjrzTQgoai6Eb2vgM=";
|
||||
outputHashMode = "flat";
|
||||
}
|
||||
'';
|
||||
|
||||
# Base system for all fetchers
|
||||
baseNixSystem = ipSuffix: {
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.0.${toString ipSuffix}";
|
||||
prefixLength = 24;
|
||||
}
|
||||
{
|
||||
address = "1.0.0.${toString ipSuffix}";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
nftables = {
|
||||
enable = true;
|
||||
flushRuleset = false;
|
||||
};
|
||||
};
|
||||
|
||||
nix.settings = {
|
||||
# Gets rid of substitution warnings
|
||||
substituters = lib.mkForce [ ];
|
||||
# Gives us access inside the nix sandbox
|
||||
extra-sandbox-paths = [ "${pkgs.pkgsStatic.busybox}" ];
|
||||
};
|
||||
|
||||
# Easy way to get files to the system
|
||||
environment.etc = {
|
||||
"fetch-public.nix".source = publicFetcher;
|
||||
"fetch-private.nix".source = privateFetcher;
|
||||
"fetch-public-other-port.nix".source = publicFetcherOtherPort;
|
||||
"fetch-localhost.nix".source = localhostFetcher;
|
||||
"resolver.nix".source = resolver;
|
||||
};
|
||||
|
||||
# For localhost tests
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts.default.locations."/a".return = "200 \"a\"";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "nix-daemon-firewall";
|
||||
meta.maintainers = with lib.maintainers; [ das_j ];
|
||||
|
||||
nodes = {
|
||||
httpServer = {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts.default = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 80;
|
||||
}
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 81;
|
||||
}
|
||||
];
|
||||
locations = {
|
||||
"/a".return = "200 \"a\"";
|
||||
"/b".return = "200 \"b\"";
|
||||
"/c".return = "200 \"c\"";
|
||||
};
|
||||
};
|
||||
};
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
interfaces.eth1 = {
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.0.1";
|
||||
prefixLength = 24;
|
||||
}
|
||||
{
|
||||
address = "1.0.0.1";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
firewall.allowedTCPPorts = [
|
||||
80
|
||||
81
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
unfirewalled = {
|
||||
imports = [ (baseNixSystem 2) ];
|
||||
};
|
||||
|
||||
everythingAllowed = {
|
||||
imports = [ (baseNixSystem 3) ];
|
||||
nix.firewall = {
|
||||
enable = true;
|
||||
allowLoopback = true;
|
||||
allowNonTCPUDP = true;
|
||||
};
|
||||
};
|
||||
|
||||
noLocalNets = {
|
||||
imports = [ (baseNixSystem 4) ];
|
||||
nix.firewall = {
|
||||
enable = true;
|
||||
allowPrivateNetworks = false;
|
||||
};
|
||||
};
|
||||
|
||||
onlyPort80 = {
|
||||
imports = [ (baseNixSystem 5) ];
|
||||
nix.firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [ 80 ];
|
||||
};
|
||||
};
|
||||
|
||||
resolved = {
|
||||
imports = [ (baseNixSystem 6) ];
|
||||
nix.firewall = {
|
||||
enable = true;
|
||||
};
|
||||
services.resolved.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Startup
|
||||
start_all()
|
||||
httpServer.wait_for_open_port(80)
|
||||
|
||||
# No firewall
|
||||
unfirewalled.wait_for_unit("multi-user.target")
|
||||
unfirewalled.fail("nft list ruleset | grep nix_daemon_traffic")
|
||||
|
||||
# Everything allowed
|
||||
everythingAllowed.wait_for_unit("multi-user.target")
|
||||
everythingAllowed.succeed("nft list ruleset | grep nix_daemon_traffic")
|
||||
everythingAllowed.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-public.nix")
|
||||
everythingAllowed.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-private.nix")
|
||||
everythingAllowed.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-public-other-port.nix")
|
||||
everythingAllowed.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-localhost.nix")
|
||||
|
||||
# No local networks and no localhost
|
||||
noLocalNets.wait_for_unit("multi-user.target")
|
||||
noLocalNets.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-public.nix")
|
||||
noLocalNets.fail("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-private.nix")
|
||||
noLocalNets.fail("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-localhost.nix")
|
||||
|
||||
# Ports
|
||||
onlyPort80.wait_for_unit("multi-user.target")
|
||||
onlyPort80.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-public.nix")
|
||||
onlyPort80.fail("NIX_REMOTE=daemon nix-build --timeout 5 /etc/fetch-public-other-port.nix")
|
||||
|
||||
# systemd-resolved
|
||||
resolved.wait_for_unit("multi-user.target")
|
||||
resolved.succeed("NIX_REMOTE=daemon nix-build --timeout 5 /etc/resolver.nix")
|
||||
'';
|
||||
}
|
||||
@@ -103,6 +103,8 @@
|
||||
impl,
|
||||
reftools,
|
||||
revive,
|
||||
tree-sitter-grammars,
|
||||
neovimUtils,
|
||||
# hurl dependencies
|
||||
hurl,
|
||||
# must be lua51Packages
|
||||
@@ -2066,6 +2068,13 @@ assertNoAdditions {
|
||||
];
|
||||
};
|
||||
|
||||
neorg = super.neorg.overrideAttrs {
|
||||
dependencies = [
|
||||
(neovimUtils.grammarToPlugin tree-sitter-grammars.tree-sitter-norg)
|
||||
(neovimUtils.grammarToPlugin tree-sitter-grammars.tree-sitter-norg-meta)
|
||||
];
|
||||
};
|
||||
|
||||
neorg-telescope = super.neorg-telescope.overrideAttrs {
|
||||
buildInputs = [ luaPackages.lua-utils-nvim ];
|
||||
dependencies = with self; [
|
||||
|
||||
@@ -2354,8 +2354,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "Ionide-fsharp";
|
||||
publisher = "Ionide";
|
||||
version = "7.29.0";
|
||||
hash = "sha256-x8ixfBFit7kcZGZT7eDKrzBnXRkovL8DxVzPLsgT3L0=";
|
||||
version = "7.30.0";
|
||||
hash = "sha256-cN+NWHkl21ibvW743ST4kFmxGwfc6ZyNWPOyIRjFEwU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -10,16 +10,19 @@
|
||||
gettext,
|
||||
libarchive,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-cb";
|
||||
version = "0.1.11";
|
||||
version = "0.1.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-cb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Dj398aUQBxOrH5XOC5u/vNkEQ6pa05/EDB5m0EAGAxo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
gettext
|
||||
desktop-file-utils
|
||||
appstream
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
wrapGAppsHook3,
|
||||
@@ -32,11 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura";
|
||||
version = "0.5.13";
|
||||
version = "0.5.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-YwIXO81G+JflIJyIOltRrR2rSUbC84YcujdKO4DY88E=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Ejd39gUWA9YEoPpaaxo+9JkoezAjXYpXTB+FGdXt03U=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -11,16 +11,19 @@
|
||||
djvulibre,
|
||||
gettext,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-djvu";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-djvu";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TehD0uTQguH8f6pdOSIyhr1m87jB3F0WTUNtUM0fPu4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
appstream
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
meson,
|
||||
ninja,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cairo,
|
||||
girara,
|
||||
gtk-mac-integration,
|
||||
@@ -18,17 +18,20 @@
|
||||
leptonica,
|
||||
mujs,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.4.4";
|
||||
version = "0.4.6";
|
||||
pname = "zathura-pdf-mupdf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-pdf-mupdf";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vg/ac62MPTWRbTPjbh+rKcFjVb5237wBEIVvTef6K5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
appstream
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
@@ -60,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; };
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -9,16 +9,19 @@
|
||||
girara,
|
||||
poppler,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-pdf-poppler";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-pdf-poppler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xRTJlPj8sKRjwyuf1hWDyL1n4emLnAEVxVjn6XYn5IU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
appstream
|
||||
appstream-glib
|
||||
zathura_core
|
||||
];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -10,16 +10,19 @@
|
||||
libspectre,
|
||||
gettext,
|
||||
desktop-file-utils,
|
||||
appstream,
|
||||
appstream-glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zathura-ps";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwmt";
|
||||
repo = "zathura-ps";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YQtMfHhPAe8LtJfcw8LRGe5LvtPY7DjYKFaWOYlveeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
gettext
|
||||
desktop-file-utils
|
||||
appstream
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
|
||||
@@ -705,11 +705,11 @@
|
||||
"vendorHash": "sha256-BUxnKxr0htpdSSTMzb3ix1nNlX7PTBv38ozDjnZ2eK8="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-Bj4jwTSw4qduu4BLgXHB72CQ/zDsIwbXh/lz1g/BS3s=",
|
||||
"hash": "sha256-V2QiWq6LJctr2UNNR3O5J60hUiMNw7LttuxcA5ZAZ8o=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.81.0",
|
||||
"rev": "v1.82.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -15,25 +15,25 @@ in
|
||||
{
|
||||
guiStable = mkGui {
|
||||
channel = "stable";
|
||||
version = "2.2.54";
|
||||
hash = "sha256-rR7hrNX7BE86x51yaqvTKGfcc8ESnniFNOZ8Bu1Yzuc=";
|
||||
version = "2.2.55";
|
||||
hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ=";
|
||||
};
|
||||
|
||||
guiPreview = mkGui {
|
||||
channel = "stable";
|
||||
version = "2.2.54";
|
||||
hash = "sha256-rR7hrNX7BE86x51yaqvTKGfcc8ESnniFNOZ8Bu1Yzuc=";
|
||||
version = "2.2.55";
|
||||
hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ=";
|
||||
};
|
||||
|
||||
serverStable = mkServer {
|
||||
channel = "stable";
|
||||
version = "2.2.54";
|
||||
hash = "sha256-ih/9zIJtex9ikZ4oCuyYEjZ3U/BtxDojOz6FnJ0HOYU=";
|
||||
version = "2.2.55";
|
||||
hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";
|
||||
};
|
||||
|
||||
serverPreview = mkServer {
|
||||
channel = "stable";
|
||||
version = "2.2.54";
|
||||
hash = "sha256-ih/9zIJtex9ikZ4oCuyYEjZ3U/BtxDojOz6FnJ0HOYU=";
|
||||
version = "2.2.55";
|
||||
hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hypr-darkwindow";
|
||||
version = "0.52.1";
|
||||
version = "0.52.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micha4w";
|
||||
|
||||
@@ -51,6 +51,7 @@ let
|
||||
{
|
||||
"i686-linux" = "lib32";
|
||||
"x86_64-linux" = "lib64";
|
||||
"aarch64-linux" = "lib64";
|
||||
}
|
||||
.${stdenv.system} or (throw "Please expand list of system with defaultLib for '${stdenv.system}'");
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JZ0LbULvUwovGtKMiENV6OiBhOQMOqBMdLs874x95HA=";
|
||||
hash = "sha256-/fhR5LmRxE5U7Up73/bQs8rfoPynDn29C+hwTdR8Eu0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "asmjit";
|
||||
version = "1.18-unstable-2025-11-03";
|
||||
version = "0-unstable-2025-12-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asmjit";
|
||||
repo = "asmjit";
|
||||
rev = "b56f4176cb9b0c0501da659ac54d4c5877862c7b";
|
||||
hash = "sha256-fOYJak+DiGM3vazKwOffTGuqPuUi7p+I0phBmtfqzME=";
|
||||
rev = "0cf6eafda249fc99cee2df0fb57a5c5f38e92f93";
|
||||
hash = "sha256-PBsygYaIS45t2Br3YnIEbNSQcvxuL8JdUaDoHI/2tRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.104";
|
||||
version = "2.0.105";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-W4iGBbWLG7HATXGv1xsapGlQ0i+RiPsIZwXET5qaPGE=";
|
||||
sha256 = "sha256-CMdVYk1Mn0uenhPuaSG2Ruisfps8wAug0PC/GGfesYU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YNBuiTUbGlUea81j+5u3qZj/xaciZ5D9QcWfe4nEG7c=";
|
||||
cargoHash = "sha256-fXorWbazWWBoXjTIT1t6kWRW065pTM+u+S36X7zhoj8=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -27,16 +27,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bacon";
|
||||
version = "3.20.1";
|
||||
version = "3.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "bacon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t1Qzw3ku6+L6y22WJrIktGoIex6KHvfdXUij+sWik/U=";
|
||||
hash = "sha256-UMSYXrD2lDJS2HYiCzm22r40Y4EzAjgEmNhV8hvarTo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XfDKgnE+o4vxvw4UFsu3CfRcQyXcPHxHHZMcf25L6Tc=";
|
||||
cargoHash = "sha256-m+9Psm29zV4kOb2mpynR3S/EBajAqPU11iBO9kHlD9o=";
|
||||
|
||||
buildFeatures = lib.optionals withSound [
|
||||
"sound"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "buffrs";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helsing-ai";
|
||||
repo = "buffrs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-c1QMPFVc9k3hTK7Y1aimXbJ4IKBNmAt9aYtiUIchG8E=";
|
||||
hash = "sha256-wbJFkKiTMQQJfCO1RyELMyW94lGfECDii3zg7cqc71o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6592v/ednZDaKfMcaMCAmJOh4ZhZdBwIpEZiqsbF4hU=";
|
||||
cargoHash = "sha256-zPmFDlOLbv/Zp5qVeiHBxVOfma9X7IpRQ+ascHbz+GQ=";
|
||||
|
||||
# Disabling tests meant to work over the network, as they will fail
|
||||
# inside the builder.
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-5LRzYhBcf+C5DgUmeCPu/k52MGuuNjWgXrnP5kl0Z2g=";
|
||||
hash = "sha256-ssbm2XevvB1zzVVeOUTxUUKcD8smlsOjy9efnFLw03M=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PRo5XKBIJiYaiC/7L6ycP7HCJQq/J0HBPYhuzBTO2ZY=";
|
||||
npmDepsHash = "sha256-VxFxMvbkEnjooSq1Ats4tC8Dcqr3EVffccxOXNha4MY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -15,21 +15,21 @@ let
|
||||
|
||||
channels = {
|
||||
stable = {
|
||||
version = "2.28.5";
|
||||
version = "2.28.6";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-eVMCIdXTWr3jmJYbR9ycoddqyst0immXfSSbeegFNwo=";
|
||||
x86_64-darwin = "sha256-hwLtrPY1NARgeiQzoC+LiF9ELt7pAYiNnk767M4j41s=";
|
||||
aarch64-linux = "sha256-F4WpbZ/wz/Tt1dzEFYlciPo2yPbH7nv7sJA+frIbAlA=";
|
||||
aarch64-darwin = "sha256-oIpVJ2eMo/iarM037UEaY/+C10BVOvb6P+vXlb3v6Fk=";
|
||||
x86_64-linux = "sha256-OBnEOR6uNCzfsnWIQupSN9JMykNbrojrkb5lcPXL1W8=";
|
||||
x86_64-darwin = "sha256-ixI5BPxq7spPk1Un6eYVke+IkhqoIxTqDTXo5FehaEk=";
|
||||
aarch64-linux = "sha256-w+5PMff13nUp7jAYGSQlozShWqjsF+NLKQiquxD07wc=";
|
||||
aarch64-darwin = "sha256-nrx0Z1NdzkeQbeWzwOhpATIYnCCucG5lKRoUaRVjiQE=";
|
||||
};
|
||||
};
|
||||
mainline = {
|
||||
version = "2.29.0";
|
||||
version = "2.29.1";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-gDgDJMm7I11eRyitzFyJpUG2EODCuvEsmmxdSkXeYlQ=";
|
||||
x86_64-darwin = "sha256-qKgTVrmYQDfyrWQ8OD4QZ6KV8v32/aZIG9npCRUklD4=";
|
||||
aarch64-linux = "sha256-mx8vTmLXtcxTESF2LrZOaRTXu08ofOKAD6WxP3Ekcfg=";
|
||||
aarch64-darwin = "sha256-4kOoJ+Ru3RAJXD0j3GvDRcloimpHVHXv/nB/q9+y2GQ=";
|
||||
x86_64-linux = "sha256-LxYADRdkiIsvHBaMy+MtJuUo8p5MLDKDL6pMtHaqokw=";
|
||||
x86_64-darwin = "sha256-OwZpCTjEVzTu4M9jf0vOuTuiyn66qRc/pEO/DLD8pvg=";
|
||||
aarch64-linux = "sha256-hNPimwzopC2Hj8i0I6KJAtvKXANACpmcN+onGvAaMvc=";
|
||||
aarch64-darwin = "sha256-AuNFtvnG40Toll/hmEXeGuV6ZcxfuVuUTFqdtTLXRn8=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "dioxus-cli";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-tPymoJJvz64G8QObLkiVhnW0pBV/ABskMdq7g7o9f1A=";
|
||||
hash = "sha256-VCoTxZKFYkGBCu1X/9US/OCFpp6zc5ojmXWJfzozCxc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mgscu6mJWinB8WXLnLNq/JQnRpHRJKMQXnMwECz1vwc=";
|
||||
cargoHash = "sha256-de8z68uXnrzyxTJY53saJ6hT7rvYbSdsSA/WWQa6nl4=";
|
||||
buildFeatures = [
|
||||
"no-downloads"
|
||||
]
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsx";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "dnsx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v5GDDA+ubHtUtLvhe0Hwm6l3OqTcIFbdm6HuxxV2zco=";
|
||||
hash = "sha256-XtjNdqUS1l6Ct5s+OXmmwvpuckKTaHD2S4tn39Tvf1Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-B9GwQaX/W2xjpIFicfFFGBcopxyhMKZZRKBPcQ/r5Oo=";
|
||||
vendorHash = "sha256-ng0S/oFnrSlJ6a2UIZ3IrZx0Tb8Mru9BOuHBqH/1ctU=";
|
||||
|
||||
subPackages = [ "cmd/dnsx" ];
|
||||
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2025.11.4";
|
||||
version = "2025.11.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-uV5lSlAFHTxIJqkvwRiDWcB2Hw+z+4+phBm2JHld4jA=";
|
||||
hash = "sha256-ln+LuV//FVb+Jy6cMNth6RaFtusf/ZCLtYowlDnBybE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.211.0";
|
||||
version = "0.211.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-nbRXQ+3nAH32J4QegfeeFT+4TqdsTcIhxhAC6e9DyR8=";
|
||||
hash = "sha256-taDgpuM3GbqD+v9sNXvJYiJLE1wvXzS/ILZgAGFUuw4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-arrEWH3rspwynRXf43sElliEJ2kBxhikz1ZGS1+gDes=";
|
||||
vendorHash = "sha256-VG1/6KadRC4jLBIOL39M6l8ZED1KLb+wKGHNQowAV1g=";
|
||||
|
||||
commonMeta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2025-12-04";
|
||||
version = "2025-12-09";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mos58w5rJUNR0MTSOprHMf1wvVkmP+kWQU7YV/ABNNc=";
|
||||
hash = "sha256-ISupts2tfN7XjwszQAj800p1qGUty9/aBtXZwE2SWvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "frigate-${version}-source";
|
||||
owner = "blakeblackshear";
|
||||
repo = "frigate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8Lm4iLRdMqgZvy24WS1SOkbj855c2t9yg8n91WMg5Fg=";
|
||||
hash = "sha256-gbEUmo28vjYsfIlHSBaLTUh9kK5rM17hkfKBQ9KhiBU=";
|
||||
};
|
||||
|
||||
frigate-web = callPackage ./web.nix {
|
||||
|
||||
@@ -1,19 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
_7zz,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
runCommand,
|
||||
}:
|
||||
|
||||
let
|
||||
# gamma-launcher looks for the "7z", not "7zz"
|
||||
_7z = runCommand "7z" { } ''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${_7zz}/bin/7zz $out/bin/7z
|
||||
'';
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gamma-launcher";
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mord3rca";
|
||||
repo = "gamma-launcher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qzjfgDFimEL6vtsJBubY6fHsokilDB248WwHJt3F7fI=";
|
||||
hash = "sha256-QegptRWMUKpkzsHBdT6KlyyWpmrIuvcyCRvWT9Te3DQ=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
@@ -33,13 +43,25 @@ python3Packages.buildPythonApplication rec {
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gamma-launcher \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
_7z
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Python cli to download S.T.A.L.K.E.R. GAMMA";
|
||||
changelog = "https://github.com/Mord3rca/gamma-launcher/releases/tag/v${version}";
|
||||
homepage = "https://github.com/Mord3rca/gamma-launcher";
|
||||
mainProgram = "gamma-launcher";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ DrymarchonShaun ];
|
||||
maintainers = with lib.maintainers; [
|
||||
DrymarchonShaun
|
||||
bbigras
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "geminicommit";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfkhdyt";
|
||||
repo = "geminicommit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PH9IYVlHZuXEzpRvT0luSZej1dFzUyxGzoQ+z79u5kU=";
|
||||
hash = "sha256-PAL14mxeWYEDaFL/rniLN+FNDFE/T3t2+pAK4BGqcJY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4aVUD16zhzWvgD90gttmoDRoKKb0dRgDdH1HMfgd3LU=";
|
||||
@@ -29,8 +29,8 @@ buildGoModule (finalAttrs: {
|
||||
cmd = finalAttrs.meta.mainProgram;
|
||||
goDefaultCmd = finalAttrs.pname;
|
||||
in
|
||||
# The official github released binary is renamed since v0.6.0,
|
||||
# see: https://github.com/tfkhdyt/geminicommit/releases/tag/v0.6.0
|
||||
# The official github released binary is renamed since v0.6.1,
|
||||
# see: https://github.com/tfkhdyt/geminicommit/releases/tag/v0.6.1
|
||||
# Here we link the old name (which is also the `go build` default name)
|
||||
# for backward compatibility:
|
||||
''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.83.1";
|
||||
version = "2.83.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LBrWxlHPb9qG+IszymvqFqHFvvzveG4jZAkxivpbL5o=";
|
||||
hash = "sha256-YpbxdD+83pK326EmwLCzUh+wASdOjuCqSP2eXIJndxI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sLCqUqo/0qsLpHjH81tJ/M2LD0X/kr8hToDFgZ8/wP8=";
|
||||
vendorHash = "sha256-AkcbtVR1+uYy2AtRl1hvUBBF8vI3hH4NXznmgwmAzmw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
autoPatchelfHook,
|
||||
python3,
|
||||
libxcrypt-legacy,
|
||||
tcl-8_6,
|
||||
tclPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -177,6 +179,8 @@ let
|
||||
];
|
||||
buildInputs = [
|
||||
libxcrypt-legacy
|
||||
tcl-8_6
|
||||
tclPackages.tk
|
||||
];
|
||||
passthru = {
|
||||
dependencies = filterForSystem dependencies;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevela";
|
||||
version = "1.10.5";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevela";
|
||||
repo = "kubevela";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VdHPjN3su5LxqtNGUaWttXU/Tns5U6jfdP22uozDhv8=";
|
||||
hash = "sha256-lY+gz/rv+UcIDFOIa7jFoYsFRSBcHSzET+LZH/HC1PM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MUfULgycZn8hFfWmtNeoFf21+g3gGpeKoBvL8qB/m80=";
|
||||
|
||||
Generated
+170
-122
@@ -167,16 +167,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v12.40.2",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/collections.git",
|
||||
"reference": "3a794986bad4caf369d17ae19d4ef20a38dd8b0c"
|
||||
"reference": "16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/3a794986bad4caf369d17ae19d4ef20a38dd8b0c",
|
||||
"reference": "3a794986bad4caf369d17ae19d4ef20a38dd8b0c",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d",
|
||||
"reference": "16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -222,11 +222,11 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2025-11-24T14:13:52+00:00"
|
||||
"time": "2025-12-06T18:08:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/conditionable",
|
||||
"version": "v12.40.2",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/conditionable.git",
|
||||
@@ -272,16 +272,16 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v12.40.2",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
"reference": "b97a94df448f196f23d646e21999bfd5d86ae23b"
|
||||
"reference": "19e8938edb73047017cfbd443b96844b86da4a59"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/contracts/zipball/b97a94df448f196f23d646e21999bfd5d86ae23b",
|
||||
"reference": "b97a94df448f196f23d646e21999bfd5d86ae23b",
|
||||
"url": "https://api.github.com/repos/illuminate/contracts/zipball/19e8938edb73047017cfbd443b96844b86da4a59",
|
||||
"reference": "19e8938edb73047017cfbd443b96844b86da4a59",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -316,11 +316,11 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2025-11-26T16:51:20+00:00"
|
||||
"time": "2025-11-26T21:36:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/filesystem",
|
||||
"version": "v12.40.2",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/filesystem.git",
|
||||
@@ -387,7 +387,7 @@
|
||||
},
|
||||
{
|
||||
"name": "illuminate/macroable",
|
||||
"version": "v12.40.2",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/macroable.git",
|
||||
@@ -432,17 +432,68 @@
|
||||
"time": "2024-07-23T16:31:01+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v12.40.2",
|
||||
"name": "illuminate/reflection",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "20a64e34d9ee8bb7b28b242155e9c31f86e5804b"
|
||||
"url": "https://github.com/illuminate/reflection.git",
|
||||
"reference": "7b86bc570d5b75e4a3ad79f8cca1491ba24b7c75"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/20a64e34d9ee8bb7b28b242155e9c31f86e5804b",
|
||||
"reference": "20a64e34d9ee8bb7b28b242155e9c31f86e5804b",
|
||||
"url": "https://api.github.com/repos/illuminate/reflection/zipball/7b86bc570d5b75e4a3ad79f8cca1491ba24b7c75",
|
||||
"reference": "7b86bc570d5b75e4a3ad79f8cca1491ba24b7c75",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"illuminate/collections": "^12.0",
|
||||
"illuminate/contracts": "^12.0",
|
||||
"php": "^8.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "12.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"files": [
|
||||
"helpers.php"
|
||||
],
|
||||
"psr-4": {
|
||||
"Illuminate\\Support\\": ""
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Taylor Otwell",
|
||||
"email": "taylor@laravel.com"
|
||||
}
|
||||
],
|
||||
"description": "The Illuminate Reflection package.",
|
||||
"homepage": "https://laravel.com",
|
||||
"support": {
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2025-12-09T15:11:22+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v12.42.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "d35411be5657e0b5560a5885f3c9140e4cbe0be5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/d35411be5657e0b5560a5885f3c9140e4cbe0be5",
|
||||
"reference": "d35411be5657e0b5560a5885f3c9140e4cbe0be5",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -454,6 +505,7 @@
|
||||
"illuminate/conditionable": "^12.0",
|
||||
"illuminate/contracts": "^12.0",
|
||||
"illuminate/macroable": "^12.0",
|
||||
"illuminate/reflection": "^12.0",
|
||||
"nesbot/carbon": "^3.8.4",
|
||||
"php": "^8.2",
|
||||
"symfony/polyfill-php83": "^1.33",
|
||||
@@ -508,7 +560,7 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2025-11-26T14:47:26+00:00"
|
||||
"time": "2025-12-09T15:26:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/prompts",
|
||||
@@ -571,16 +623,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nesbot/carbon",
|
||||
"version": "3.10.3",
|
||||
"version": "3.11.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/CarbonPHP/carbon.git",
|
||||
"reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f"
|
||||
"reference": "bdb375400dcd162624531666db4799b36b64e4a1"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
|
||||
"reference": "8e3643dcd149ae0fe1d2ff4f2c8e4bbfad7c165f",
|
||||
"url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/bdb375400dcd162624531666db4799b36b64e4a1",
|
||||
"reference": "bdb375400dcd162624531666db4799b36b64e4a1",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -588,9 +640,9 @@
|
||||
"ext-json": "*",
|
||||
"php": "^8.1",
|
||||
"psr/clock": "^1.0",
|
||||
"symfony/clock": "^6.3.12 || ^7.0",
|
||||
"symfony/clock": "^6.3.12 || ^7.0 || ^8.0",
|
||||
"symfony/polyfill-mbstring": "^1.0",
|
||||
"symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"
|
||||
"symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0 || ^8.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/clock-implementation": "1.0"
|
||||
@@ -672,7 +724,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-06T13:39:36+00:00"
|
||||
"time": "2025-12-02T21:04:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/clock",
|
||||
@@ -828,22 +880,21 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/clock",
|
||||
"version": "v7.3.0",
|
||||
"version": "v8.0.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/clock.git",
|
||||
"reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24"
|
||||
"reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
|
||||
"reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
|
||||
"url": "https://api.github.com/repos/symfony/clock/zipball/832119f9b8dbc6c8e6f65f30c5969eca1e88764f",
|
||||
"reference": "832119f9b8dbc6c8e6f65f30c5969eca1e88764f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.2",
|
||||
"psr/clock": "^1.0",
|
||||
"symfony/polyfill-php83": "^1.28"
|
||||
"php": ">=8.4",
|
||||
"psr/clock": "^1.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/clock-implementation": "1.0"
|
||||
@@ -882,7 +933,7 @@
|
||||
"time"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/clock/tree/v7.3.0"
|
||||
"source": "https://github.com/symfony/clock/tree/v8.0.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -893,25 +944,29 @@
|
||||
"url": "https://github.com/fabpot",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/nicolas-grekas",
|
||||
"type": "github"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-25T14:21:43+00:00"
|
||||
"time": "2025-11-12T15:46:48+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v7.3.6",
|
||||
"version": "v7.4.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a"
|
||||
"reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
|
||||
"reference": "c28ad91448f86c5f6d9d2c70f0cf68bf135f252a",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e",
|
||||
"reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -919,7 +974,7 @@
|
||||
"symfony/deprecation-contracts": "^2.5|^3",
|
||||
"symfony/polyfill-mbstring": "~1.0",
|
||||
"symfony/service-contracts": "^2.5|^3",
|
||||
"symfony/string": "^7.2"
|
||||
"symfony/string": "^7.2|^8.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/dependency-injection": "<6.4",
|
||||
@@ -933,16 +988,16 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/config": "^6.4|^7.0",
|
||||
"symfony/dependency-injection": "^6.4|^7.0",
|
||||
"symfony/event-dispatcher": "^6.4|^7.0",
|
||||
"symfony/http-foundation": "^6.4|^7.0",
|
||||
"symfony/http-kernel": "^6.4|^7.0",
|
||||
"symfony/lock": "^6.4|^7.0",
|
||||
"symfony/messenger": "^6.4|^7.0",
|
||||
"symfony/process": "^6.4|^7.0",
|
||||
"symfony/stopwatch": "^6.4|^7.0",
|
||||
"symfony/var-dumper": "^6.4|^7.0"
|
||||
"symfony/config": "^6.4|^7.0|^8.0",
|
||||
"symfony/dependency-injection": "^6.4|^7.0|^8.0",
|
||||
"symfony/event-dispatcher": "^6.4|^7.0|^8.0",
|
||||
"symfony/http-foundation": "^6.4|^7.0|^8.0",
|
||||
"symfony/http-kernel": "^6.4|^7.0|^8.0",
|
||||
"symfony/lock": "^6.4|^7.0|^8.0",
|
||||
"symfony/messenger": "^6.4|^7.0|^8.0",
|
||||
"symfony/process": "^6.4|^7.0|^8.0",
|
||||
"symfony/stopwatch": "^6.4|^7.0|^8.0",
|
||||
"symfony/var-dumper": "^6.4|^7.0|^8.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@@ -976,7 +1031,7 @@
|
||||
"terminal"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/console/tree/v7.3.6"
|
||||
"source": "https://github.com/symfony/console/tree/v7.4.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -996,7 +1051,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-11-04T01:21:42+00:00"
|
||||
"time": "2025-12-05T15:23:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/deprecation-contracts",
|
||||
@@ -1067,23 +1122,23 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v7.3.5",
|
||||
"version": "v7.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "9f696d2f1e340484b4683f7853b273abff94421f"
|
||||
"reference": "340b9ed7320570f319028a2cbec46d40535e94bd"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
|
||||
"reference": "9f696d2f1e340484b4683f7853b273abff94421f",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/340b9ed7320570f319028a2cbec46d40535e94bd",
|
||||
"reference": "340b9ed7320570f319028a2cbec46d40535e94bd",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.2"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/filesystem": "^6.4|^7.0"
|
||||
"symfony/filesystem": "^6.4|^7.0|^8.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@@ -1111,7 +1166,7 @@
|
||||
"description": "Finds files and directories via an intuitive fluent interface",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/finder/tree/v7.3.5"
|
||||
"source": "https://github.com/symfony/finder/tree/v7.4.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -1131,7 +1186,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-10-15T18:45:57+00:00"
|
||||
"time": "2025-11-05T05:42:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
@@ -1710,16 +1765,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v7.3.4",
|
||||
"version": "v7.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
|
||||
"reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
|
||||
"reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/7ca8dc2d0dcf4882658313aba8be5d9fd01026c8",
|
||||
"reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1751,7 +1806,7 @@
|
||||
"description": "Executes commands in sub-processes",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/process/tree/v7.3.4"
|
||||
"source": "https://github.com/symfony/process/tree/v7.4.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -1771,7 +1826,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-11T10:12:26+00:00"
|
||||
"time": "2025-10-16T11:21:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/service-contracts",
|
||||
@@ -1862,34 +1917,34 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/string",
|
||||
"version": "v7.3.4",
|
||||
"version": "v8.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/string.git",
|
||||
"reference": "f96476035142921000338bad71e5247fbc138872"
|
||||
"reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
|
||||
"reference": "f96476035142921000338bad71e5247fbc138872",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/ba65a969ac918ce0cc3edfac6cdde847eba231dc",
|
||||
"reference": "ba65a969ac918ce0cc3edfac6cdde847eba231dc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.2",
|
||||
"symfony/polyfill-ctype": "~1.8",
|
||||
"symfony/polyfill-intl-grapheme": "~1.0",
|
||||
"symfony/polyfill-intl-normalizer": "~1.0",
|
||||
"symfony/polyfill-mbstring": "~1.0"
|
||||
"php": ">=8.4",
|
||||
"symfony/polyfill-ctype": "^1.8",
|
||||
"symfony/polyfill-intl-grapheme": "^1.33",
|
||||
"symfony/polyfill-intl-normalizer": "^1.0",
|
||||
"symfony/polyfill-mbstring": "^1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/translation-contracts": "<2.5"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/emoji": "^7.1",
|
||||
"symfony/http-client": "^6.4|^7.0",
|
||||
"symfony/intl": "^6.4|^7.0",
|
||||
"symfony/emoji": "^7.4|^8.0",
|
||||
"symfony/http-client": "^7.4|^8.0",
|
||||
"symfony/intl": "^7.4|^8.0",
|
||||
"symfony/translation-contracts": "^2.5|^3.0",
|
||||
"symfony/var-exporter": "^6.4|^7.0"
|
||||
"symfony/var-exporter": "^7.4|^8.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@@ -1928,7 +1983,7 @@
|
||||
"utf8"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/string/tree/v7.3.4"
|
||||
"source": "https://github.com/symfony/string/tree/v8.0.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -1948,38 +2003,31 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-11T14:36:48+00:00"
|
||||
"time": "2025-12-01T09:13:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v7.3.4",
|
||||
"version": "v8.0.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "ec25870502d0c7072d086e8ffba1420c85965174"
|
||||
"reference": "770e3b8b0ba8360958abedcabacd4203467333ca"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/ec25870502d0c7072d086e8ffba1420c85965174",
|
||||
"reference": "ec25870502d0c7072d086e8ffba1420c85965174",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/770e3b8b0ba8360958abedcabacd4203467333ca",
|
||||
"reference": "770e3b8b0ba8360958abedcabacd4203467333ca",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=8.2",
|
||||
"symfony/deprecation-contracts": "^2.5|^3",
|
||||
"symfony/polyfill-mbstring": "~1.0",
|
||||
"symfony/translation-contracts": "^2.5|^3.0"
|
||||
"php": ">=8.4",
|
||||
"symfony/polyfill-mbstring": "^1.0",
|
||||
"symfony/translation-contracts": "^3.6.1"
|
||||
},
|
||||
"conflict": {
|
||||
"nikic/php-parser": "<5.0",
|
||||
"symfony/config": "<6.4",
|
||||
"symfony/console": "<6.4",
|
||||
"symfony/dependency-injection": "<6.4",
|
||||
"symfony/http-client-contracts": "<2.5",
|
||||
"symfony/http-kernel": "<6.4",
|
||||
"symfony/service-contracts": "<2.5",
|
||||
"symfony/twig-bundle": "<6.4",
|
||||
"symfony/yaml": "<6.4"
|
||||
"symfony/service-contracts": "<2.5"
|
||||
},
|
||||
"provide": {
|
||||
"symfony/translation-implementation": "2.3|3.0"
|
||||
@@ -1987,17 +2035,17 @@
|
||||
"require-dev": {
|
||||
"nikic/php-parser": "^5.0",
|
||||
"psr/log": "^1|^2|^3",
|
||||
"symfony/config": "^6.4|^7.0",
|
||||
"symfony/console": "^6.4|^7.0",
|
||||
"symfony/dependency-injection": "^6.4|^7.0",
|
||||
"symfony/finder": "^6.4|^7.0",
|
||||
"symfony/config": "^7.4|^8.0",
|
||||
"symfony/console": "^7.4|^8.0",
|
||||
"symfony/dependency-injection": "^7.4|^8.0",
|
||||
"symfony/finder": "^7.4|^8.0",
|
||||
"symfony/http-client-contracts": "^2.5|^3.0",
|
||||
"symfony/http-kernel": "^6.4|^7.0",
|
||||
"symfony/intl": "^6.4|^7.0",
|
||||
"symfony/http-kernel": "^7.4|^8.0",
|
||||
"symfony/intl": "^7.4|^8.0",
|
||||
"symfony/polyfill-intl-icu": "^1.21",
|
||||
"symfony/routing": "^6.4|^7.0",
|
||||
"symfony/routing": "^7.4|^8.0",
|
||||
"symfony/service-contracts": "^2.5|^3",
|
||||
"symfony/yaml": "^6.4|^7.0"
|
||||
"symfony/yaml": "^7.4|^8.0"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@@ -2028,7 +2076,7 @@
|
||||
"description": "Provides tools to internationalize your application",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/translation/tree/v7.3.4"
|
||||
"source": "https://github.com/symfony/translation/tree/v8.0.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -2048,7 +2096,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-07T11:39:36+00:00"
|
||||
"time": "2025-12-01T09:13:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation-contracts",
|
||||
@@ -2270,16 +2318,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
"version": "v5.6.2",
|
||||
"version": "v5.7.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||
"reference": "3a454ca033b9e06b63282ce19562e892747449bb"
|
||||
"reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
|
||||
"reference": "3a454ca033b9e06b63282ce19562e892747449bb",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
|
||||
"reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2322,9 +2370,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
||||
"source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
|
||||
"source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
|
||||
},
|
||||
"time": "2025-10-21T19:32:17+00:00"
|
||||
"time": "2025-12-06T11:56:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phar-io/manifest",
|
||||
@@ -2446,11 +2494,11 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "2.1.32",
|
||||
"version": "2.1.33",
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227",
|
||||
"reference": "e126cad1e30a99b137b8ed75a85a676450ebb227",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/9e800e6bee7d5bd02784d4c6069b48032d16224f",
|
||||
"reference": "9e800e6bee7d5bd02784d4c6069b48032d16224f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2495,7 +2543,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-11-11T15:18:17+00:00"
|
||||
"time": "2025-12-05T10:24:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
@@ -2820,16 +2868,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "10.5.58",
|
||||
"version": "10.5.60",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "e24fb46da450d8e6a5788670513c1af1424f16ca"
|
||||
"reference": "f2e26f52f80ef77832e359205f216eeac00e320c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e24fb46da450d8e6a5788670513c1af1424f16ca",
|
||||
"reference": "e24fb46da450d8e6a5788670513c1af1424f16ca",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f2e26f52f80ef77832e359205f216eeac00e320c",
|
||||
"reference": "f2e26f52f80ef77832e359205f216eeac00e320c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2901,7 +2949,7 @@
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.58"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.60"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -2925,7 +2973,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2025-09-28T12:04:46+00:00"
|
||||
"time": "2025-12-06T07:50:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
|
||||
@@ -7,19 +7,19 @@
|
||||
}:
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "laravel";
|
||||
version = "5.23.1";
|
||||
version = "5.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laravel";
|
||||
repo = "installer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PXMwWsp2dwDj67waT5FXsKMgXnbmNFhHR07Jw7ePkx8=";
|
||||
hash = "sha256-ZGGbWRRmotqUwVICdqHRHy2wH8Nb4WRn+6Ape9kxFlY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-FxKqFjrgothuWZOJySQ+yV1ygVWrrbv3h0hXAwaqHsQ=";
|
||||
vendorHash = "sha256-TUCv+zXE+xmdtN0vDToEqlw4+WOi+xX87IrGmUAeQkM=";
|
||||
|
||||
# Adding npm (nodejs) and php composer to path
|
||||
postInstall = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "libretro-shaders-slang";
|
||||
version = "0-unstable-2025-12-02";
|
||||
version = "0-unstable-2025-12-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "slang-shaders";
|
||||
rev = "cf5c768ffda2520d4938df68d33fd63fff276c0c";
|
||||
hash = "sha256-0ExGupoxdKAbQ6znzHixivvskFwgO+aKLsRvJlfB0Oc=";
|
||||
rev = "f5d06a93513e91f67254fe27effc5e95aebc1d4e";
|
||||
hash = "sha256-RdQwmasgq+nd1k/Fr2SOdElua/b2IG/6c/onOLlLZdM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -27,8 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -R dist/* $out
|
||||
mkdir -p $out/admin
|
||||
cp -R dist/* $out/admin
|
||||
cp node_modules/altcha/dist/altcha.umd.cjs $out/altcha.umd.js
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
|
||||
@@ -46,8 +46,9 @@ buildGoModule (finalAttrs: {
|
||||
"queries.sql"
|
||||
"permissions.json"
|
||||
"static/public:/public"
|
||||
"${finalAttrs.passthru.frontend}/altcha.umd.js:/public/static/altcha.umd.js"
|
||||
"static/email-templates"
|
||||
"${finalAttrs.passthru.frontend}:/admin"
|
||||
"${finalAttrs.passthru.frontend}/admin:/admin"
|
||||
"i18n:/i18n"
|
||||
];
|
||||
in
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mcphost";
|
||||
version = "0.31.4";
|
||||
version = "0.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mark3labs";
|
||||
repo = "mcphost";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iVcoNOCD8g0HDrp4agK8m7gv4DkcYekdRlPpN41Wrf0=";
|
||||
hash = "sha256-zTSU7phEvoiw64V9QQI3IrHA9seStjOZadWaYwjlY9w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4qioHQXdikYItQkYlyXp/Qtuun8FICxyzyWQx/mTSpA=";
|
||||
vendorHash = "sha256-NBxJim9Abm9dHADXita5NHQf4hbR/IUz4VyeYpHYN2I=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2025-12-01";
|
||||
version = "0-unstable-2025-12-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "nu_scripts";
|
||||
rev = "485a62c9a3522ef13abb1770523a2a566da721bd";
|
||||
hash = "sha256-+m4T1xSngA5z0OHQGyzhVg6kOyEzwOOX7VuWsluYP10=";
|
||||
rev = "3d6b378c151fee9be3f0dc97fb1fab990c55181a";
|
||||
hash = "sha256-uMFoC4gtKTq2JIPOgmkdEyqVNg8eJxnU9UM1GsFVTh0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "pocket-id";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocket-id";
|
||||
repo = "pocket-id";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mnmBwQ79sScTPM4Gh9g0x/QTmqm1TgxaOkww+bvs1b4=";
|
||||
hash = "sha256-2tGd/gl0Pm5b5GfkTsChvZoWov4dwljwqDcitX5NKCY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
||||
vendorHash = "sha256-CmhPURPNwcpmD9shLrQPVKFGBirEMjq0Z4lmgMCpxS8=";
|
||||
vendorHash = "sha256-ttbiuYRWbn8KRZtg499R4NF/E9+B+fOylxZcMwNg69M=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
@@ -34,6 +34,11 @@ buildGo125Module (finalAttrs: {
|
||||
cp -r ${finalAttrs.frontend}/lib/pocket-id-frontend/dist frontend/dist
|
||||
'';
|
||||
|
||||
checkFlags = [
|
||||
# requires networking
|
||||
"-skip=TestOidcService_downloadAndSaveLogoFromURL"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
mv $out/bin/cmd $out/bin/pocket-id
|
||||
'';
|
||||
@@ -49,7 +54,7 @@ buildGo125Module (finalAttrs: {
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-/e1zBHdy3exqbMvlv0Jth7vpJd7DDnWXGfMV+Cdr56I=";
|
||||
hash = "sha256-drXGcUHP7J7keGra7/x1tr9Pfh/wjzmtUE1yAybYXLQ=";
|
||||
};
|
||||
|
||||
env.BUILD_OUTPUT_PATH = "dist";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polarity";
|
||||
version = "latest-unstable-2025-11-28";
|
||||
version = "latest-unstable-2025-12-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarity-lang";
|
||||
repo = "polarity";
|
||||
rev = "93721a14f3d473a2b8367e76c301780f863343d0";
|
||||
hash = "sha256-oLoYRs0tqsRcoB8IuiV+LVdTMH1qnilE75uH+Th8jJY=";
|
||||
rev = "fde43ec216e70022bcc6d637249c5ef093b73aaf";
|
||||
hash = "sha256-Kd1MMxdrTbV8M8h1MW4REsGf+ehLvb8bXm9OzwGqUDA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A=";
|
||||
cargoHash = "sha256-Upnm79E7pwoZR/13TnDob0Hbd3GNixtbB8gbrkLYGFQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
let
|
||||
version = "2.65.0";
|
||||
version = "2.65.1";
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit version;
|
||||
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "pyfa-org";
|
||||
repo = "Pyfa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KMSIN8amXl7q9sSvJwDobJzRZL0s4NN4KQxI/gBglyk=";
|
||||
hash = "sha256-s53EkXPySdijmkb32VZs44Fuy+lckBu9RxMfPVe0mag=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qlementine-icons";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oclero";
|
||||
repo = "qlementine-icons";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tx3CWEuLIAY8Wk5TUe9Z6+i579GVCr7Vbukzc21K26Y=";
|
||||
hash = "sha256-wXpFyVTFNHTVkGz2fQ2gQHdvCfZNs6Dx8hhonFRZytg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "qovery-cli";
|
||||
version = "1.56.0";
|
||||
version = "1.56.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IeK0GcYi3J86IABYfKvE3ict8AOnpuwuecqadNYcVrY=";
|
||||
hash = "sha256-dVjpmoIO7sOvGNWyN8kshfMJQfBoLo59QD0hfozMe+U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-owsLDP2ufW0kXmWOFtAiXKx/YiKEGL0QXkRQy1uA2Uw=";
|
||||
|
||||
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
|
||||
rebol = fetchurl {
|
||||
url = "http://www.rebol.com/downloads/v278/rebol-core-278-4-2.tar.gz";
|
||||
sha256 = "1c1v0pyhf3d8z98qc93a5zmx0bbl0qq5lr8mbkdgygqsq2bv2xbz";
|
||||
meta.license = lib.licenses.unfree; # https://www.rebol.com/license.html
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-moegirl";
|
||||
version = "20251109";
|
||||
version = "20251210";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
|
||||
hash = "sha256-GBevsjo6KRd6Uicy2LpMwgZJkluN5n2ID/DAiaKJV74=";
|
||||
hash = "sha256-P4AAwApknEaV4PFn6/5rpawp0iOGdDH+muYi+R/iErk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "roboto";
|
||||
version = "3.012";
|
||||
version = "3.014";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/googlefonts/roboto-3-classic/releases/download/v${finalAttrs.version}/Roboto_v${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-J1X5+/pW5HgX6LIqQDaZeRmwdIwEVowzsf5Bg0OQy2M=";
|
||||
hash = "sha256-JP30nhh0CcQMqWgvA9Tmu6hCD1F8bx4XMbX0F6T6jUk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtags";
|
||||
version = "2.41-unstable-2025-11-19";
|
||||
version = "2.41-unstable-2025-12-06";
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "7fcfacb5b4f9da43b99c8e9938d1d145ac241458";
|
||||
hash = "sha256-97np2vDg3jdzDP9+Gq+HtBo2m7Wbkvf2f/TTmf0ryjo=";
|
||||
rev = "b0a71e03a5f94571b18eb95c38a8c6216393a902";
|
||||
hash = "sha256-St+JoGObQAC4iYbvKiBy14D/wf6ktT1WTrWwTzNniq0=";
|
||||
fetchSubmodules = true;
|
||||
# unicode file names lead to different checksums on HFS+ vs. other
|
||||
# filesystems because of unicode normalisation
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
dbus,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gtk3,
|
||||
cairo,
|
||||
atk,
|
||||
pango,
|
||||
harfbuzz,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "rumno";
|
||||
version = "0-unstable-2025-08-13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ivanmalison";
|
||||
repo = "rumno";
|
||||
rev = "a70bf6f05976b07ae5fdced2ab80d2b9e684fb92";
|
||||
hash = "sha256-reJIYlTR6fI42EcYGwb5BmEPVtls+s1+mFd7/34oXBw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-z9nGePcVc+RPSMPb7CAPOfUMoVlP1MKo57aVFkd1DmE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
cairo
|
||||
atk
|
||||
pango
|
||||
harfbuzz
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Visual pop-up notification manager";
|
||||
homepage = "https://gitlab.com/ivanmalison/rumno";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ imalison ];
|
||||
mainProgram = "rumno";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sftpman";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "spantaleev";
|
||||
repo = "sftpman-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6IhMBnp951mKfG054svFTezf3fpOEMJusRj45qVThmA=";
|
||||
hash = "sha256-spI+MAjBT+FFD7X+G0ea9Me8wf+8Gn3kids+Dt6OO+w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TltizTFKrMvHNQcSoow9fuNLy6appYq9Y4LicEQrfRE=";
|
||||
cargoHash = "sha256-fx3uC9M9q0rXPrakZ5NYLNVQzhKZgqdjjZLQ90TNvqQ=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/spantaleev/sftpman-rs";
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "step-kms-plugin";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smallstep";
|
||||
repo = "step-kms-plugin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1g3gp2EK6bFypZJDHCEsBcixJPZpxrVyu+llthL+FDM=";
|
||||
hash = "sha256-q06so1hbiBhQ3TYKEI6C9yO0KctWVMnqGaMJpnWiEag=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6B8qZc9qkCvZQA+h7tCW94C2Y5VnNsetbSoOQXs0vFM=";
|
||||
vendorHash = "sha256-kuKKATZ7GoAy4NU8Zs/zHYdjZ++OTcT9Ep3sunEOpR0=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec {
|
||||
pname = "stig";
|
||||
# This project has a different concept for pre release / alpha,
|
||||
# Read the project's README for details: https://github.com/rndusr/stig#stig
|
||||
version = "0.14.0a0";
|
||||
version = "0.14.1a0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rndusr";
|
||||
repo = "stig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wColVJBr5oGYpN0RCh716qxKuaEhKxfl95cktZl9zMk=";
|
||||
hash = "sha256-DwZG/HB2oyLtCL2uY8X2LnXU86OYCTh6BdY3rVheJgU=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -4,39 +4,50 @@
|
||||
meson,
|
||||
fetchFromGitLab,
|
||||
systemd,
|
||||
libdrm,
|
||||
libgudev,
|
||||
pkg-config,
|
||||
wrapGAppsNoGuiHook,
|
||||
glib,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
version = "3.0";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "switcheroo-control";
|
||||
version = "2.6";
|
||||
|
||||
format = "other";
|
||||
inherit version;
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "hadess";
|
||||
repo = "switcheroo-control";
|
||||
rev = version;
|
||||
hash = "sha256-F+5HhMxM8pcnAGmVBARKWNCL0rIEzHW/jsGHHqYZJug=";
|
||||
tag = version;
|
||||
hash = "sha256-7P0o8fBYe4izRmNL7DimUSJfzj13KXW9we6c/A2iNo8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/meson.build \
|
||||
--replace-fail "rules_dir" "'${placeholder "out"}/lib/udev/rules.d'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
meson
|
||||
pkg-config
|
||||
wrapGAppsNoGuiHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
libdrm
|
||||
libgudev
|
||||
glib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
python3Packages.pygobject3
|
||||
];
|
||||
|
||||
@@ -45,6 +56,10 @@ python3Packages.buildPythonApplication rec {
|
||||
"-Dhwdbdir=${placeholder "out"}/etc/udev/hwdb.d"
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
|
||||
|
||||
meta = {
|
||||
description = "D-Bus service to check the availability of dual-GPU";
|
||||
mainProgram = "switcherooctl";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.99.5";
|
||||
version = "0.100.0";
|
||||
|
||||
triliumSource = os: arch: hash: {
|
||||
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
|
||||
@@ -26,10 +26,10 @@ let
|
||||
darwinSource = triliumSource "macos";
|
||||
|
||||
# exposed like this for update.sh
|
||||
x86_64-linux.hash = "sha256-TCb7cYjgaHghKH2uwXZ2nwu6WskcOCrmBUks2RleL/w=";
|
||||
aarch64-linux.hash = "sha256-rZ3NYSsa//+WH0O1hMmMj37YXpny+nsSk89Gzd4VVzQ=";
|
||||
x86_64-darwin.hash = "sha256-IIpblB9wi55QttVO45fv3itDS6TFc0H+DFYKScI80ks=";
|
||||
aarch64-darwin.hash = "sha256-JXulpxlRmo7+/NuvIdH8Bnrj11g7ZL01N86GQfjf33U=";
|
||||
x86_64-linux.hash = "sha256-zT8XRetevG7eIlIgC5GejGqA8sifom0un3K+Z+hSaEo=";
|
||||
aarch64-linux.hash = "sha256-xsKiVIRzFYzF8lwOZZ7yCmpi7SpPKDnPhL+GuIzoiHE=";
|
||||
x86_64-darwin.hash = "sha256-jxaNLFRmm24Hb5D6ECWWVqZQQfIpsF6u/LYf9Tt5BjI=";
|
||||
aarch64-darwin.hash = "sha256-M2VhemxBtqclExwbDxgEiu7NjNoxMYC6Gub0uY5hSh0=";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = linuxSource "x64" x86_64-linux.hash;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.99.5";
|
||||
version = "0.100.0";
|
||||
|
||||
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
|
||||
serverSource_x64.hash = "sha256-SDKLVqcqBpISW+0iSfvhEe+5Zcz9Cw/zuVQljHETZe8=";
|
||||
serverSource_x64.hash = "sha256-5ferbClXNe0jcyCNi1sFz8hUE0sDwnriZAHcDxnOFS0=";
|
||||
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||
serverSource_arm64.hash = "sha256-vNQBs4qgr35Dx+UYdiksUaE4qMU8UEdeEhIZDVz4Df0=";
|
||||
serverSource_arm64.hash = "sha256-r6mxrvLT2tmNz5nPGDDumsj4tz7dDKc3/yOMAx3gM1c=";
|
||||
|
||||
serverSource =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uarmsolver";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-cpp";
|
||||
repo = "uARMSolver";
|
||||
rev = version;
|
||||
sha256 = "sha256-IMlh6Y5iVouMZatR1uxw0gUNZBdh2qm56s+GEjcr1+M=";
|
||||
sha256 = "sha256-fJtGZ1Y1mL/JjuaDbLfXb+AjTESEGjoh3ZEmhBZKotA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vcpkg-tool";
|
||||
version = "2025-10-16";
|
||||
version = "2025-12-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vcpkg-tool";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Qu7e2cb4fDAiJ4PXRzgdsvTMM8eo6dwRCNpd/w3vWLw=";
|
||||
hash = "sha256-Sl9xs4WkydcRd5NGFGEoQEx2o+g+KAGn4UPtQ1dPpoY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "viu";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atanunq";
|
||||
repo = "viu";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sx8BH01vTFsAEnMKTcVZTDMHiVi230BVVGRexoBNxeo=";
|
||||
hash = "sha256-dI/o8gcl9s+p/8ECtgo136DMR5FkLddpdUj6uurLj04=";
|
||||
};
|
||||
|
||||
# tests need an interactive terminal
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-a9Z6/+/fMyJ2pFiKPexuiM5DAbk+Tcq3D9rDAyUwC84=";
|
||||
cargoHash = "sha256-JAQTW/7qhQCEqleKLOP4Gi9GKX+nVqQkAwlEZxVP9ps=";
|
||||
|
||||
buildFeatures = lib.optional withSixel "sixel";
|
||||
buildInputs = lib.optional withSixel libsixel;
|
||||
|
||||
@@ -2,22 +2,30 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vnote";
|
||||
version = "3.19.2-unstable-2025-10-12";
|
||||
version = "3.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vnotex";
|
||||
repo = "vnote";
|
||||
rev = "1ebe3fd4ecef69c2bacb7f2ec915666f99195ce1";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-vbud2IjmkIIkuZ7ocrQ199CEsKy1nMnidGe/d0UN9jU=";
|
||||
hash = "sha256-Ukik02qP7a86dgBTghD9wGKGpXkdGdxczg01APtcOAM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/vnotex/vnote/commit/7c59d0d061d30f8f1f57eab855b73d3b1f452df1.patch";
|
||||
hash = "sha256-gt2JDO9kGR/bjTtqTaAdHDHm9UC3XMG6KgKeDdhhNNg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qt6.wrapQtAppsHook
|
||||
|
||||
@@ -27,12 +27,15 @@ python3Packages.buildPythonApplication rec {
|
||||
"wyoming"
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
regex
|
||||
piper-tts
|
||||
sentence-stream
|
||||
wyoming
|
||||
];
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
regex
|
||||
piper-tts
|
||||
sentence-stream
|
||||
wyoming
|
||||
]
|
||||
++ wyoming.optional-dependencies.zeroconf;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wyoming_piper"
|
||||
|
||||
@@ -21,14 +21,14 @@ python3Packages.buildPythonApplication rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2025.11.12";
|
||||
version = "2025.12.08";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yt-dlp";
|
||||
repo = "yt-dlp";
|
||||
tag = version;
|
||||
hash = "sha256-Em8FLcCizSfvucg+KPuJyhFZ5MJ8STTjSpqaTD5xeKI=";
|
||||
hash = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -106,7 +106,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.215.3";
|
||||
version = "0.216.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Euok+pyp81iR900M99Jw026lgB4rbgrQKT5Vn7Kufk=";
|
||||
hash = "sha256-Sy178C5Z8F4qZzdVAnf6XI+S52Zl/8Z6dI4Qqk2d3dI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-b4tH6oc/qVSwn4JWe6ukywPTyIW2QeQo8ime6rPpFpM=";
|
||||
cargoHash = "sha256-0aKEbdV41ZNbMLx30DotmYDBuuxOgFOET79jjNhhd4Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
This change was upstreamed in e5d853bbe9b05d6a00d98ad236f01937303e40c4
|
||||
in GCC, but this file was slightly different in GCC 15, so we're
|
||||
patching it manually.
|
||||
|
||||
diff --git a/libatomic/aclocal.m4 b/libatomic/aclocal.m4
|
||||
index 80e24219d7d..581fedcfe13 100644
|
||||
--- a/libatomic/aclocal.m4
|
||||
+++ b/libatomic/aclocal.m4
|
||||
@@ -1189,6 +1189,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
m4_include([../config/acx.m4])
|
||||
m4_include([../config/depstand.m4])
|
||||
+m4_include([../config/gthr.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
@@ -41,13 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "custom-threading-model.patch";
|
||||
url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw";
|
||||
hash = "sha256-kxNntY2r4i/+XHQSpf9bYV2Jg+FD/pD5TiMn5hd4ckk=";
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/e5d853bbe9b05d6a00d98ad236f01937303e40c4.diff";
|
||||
hash = "sha256-U1Eh6ByhmseHQigfHIyO4MlAQB3fECmpPEP/M00DOg0=";
|
||||
includes = [
|
||||
"config/*"
|
||||
"libatomic/*"
|
||||
"libatomic/configure.ac"
|
||||
];
|
||||
})
|
||||
(getVersionFile "libatomic/gthr-include.patch")
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -45,18 +45,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "custom-threading-model.patch";
|
||||
url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw";
|
||||
hash = "sha256-NgiC4cFeFInXXg27me1XpSeImPaL0WHs50Tf1YHz4ps=";
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/e5d853bbe9b05d6a00d98ad236f01937303e40c4.diff";
|
||||
hash = "sha256-92LIttIXdh12/lRhivb2JTPpqUmGBRn+uKmR5pzuveo=";
|
||||
includes = [
|
||||
"config/*"
|
||||
"libgcc/configure.ac"
|
||||
];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "libgcc.mvars-less-0.patch";
|
||||
url = "https://inbox.sourceware.org/gcc-patches/20250716234028.1153560-1-John.Ericson@Obsidian.Systems/raw";
|
||||
hash = "sha256-NEcieDCsy+7IRU3qQKVD3i57OuwGZKB/rmNF8X2I1n0=";
|
||||
name = "no-pie-cflags.patch";
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/77144dd3b6736e0166156bb509590d924375a4f1.diff";
|
||||
hash = "sha256-QlxlTkWAK1dB7JiU5wz2iOW24gj3bFaeBpwb90oWwns=";
|
||||
includes = [
|
||||
"gcc/Makefile.in"
|
||||
"gcc/configure.ac"
|
||||
"libgcc/Makefile.in"
|
||||
"libgcc/configure.ac"
|
||||
];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "libgcc.mvars-less-1.patch";
|
||||
url = "https://inbox.sourceware.org/gcc-patches/20250716234028.1153560-2-John.Ericson@Obsidian.Systems/raw";
|
||||
hash = "sha256-nfRC4f6m3kHDro4+6E4y1ZPs+prxBQmn0H2rzIjaMWM=";
|
||||
name = "no-target-system-root.patch";
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/9947930b7ae923010c5061fd8fa6b1ec4f22f161.diff";
|
||||
hash = "sha256-BZmpHpJuuyDmQMwpQhSgCZO0Rg7kXt8rTiJAT+e0sUw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "regular-libdir-includedir.patch";
|
||||
|
||||
@@ -54,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "custom-threading-model.patch";
|
||||
url = "https://inbox.sourceware.org/gcc-patches/20250716204545.1063669-1-git@JohnEricson.me/raw";
|
||||
hash = "sha256-jPP0+MoPLtCwWcW6doO6KHCppwAYK40qNVyriLXcGOg=";
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/e5d853bbe9b05d6a00d98ad236f01937303e40c4.diff";
|
||||
hash = "sha256-f0XAim3uzHnUx5lm/xO00IqBHu4YUEHF2WY+c0yCF6Y=";
|
||||
includes = [
|
||||
"config/*"
|
||||
"libstdc++-v3/*"
|
||||
"libstdc++-v3/acinclude.m4"
|
||||
];
|
||||
})
|
||||
(getVersionFile "libstdcxx/force-regular-dirs.patch")
|
||||
|
||||
@@ -3904,25 +3904,21 @@ with haskellLib;
|
||||
src = src + "/cachix-api";
|
||||
} super.cachix-api;
|
||||
|
||||
cachix = lib.pipe super.cachix (
|
||||
[
|
||||
(overrideSrc {
|
||||
inherit version;
|
||||
src = src + "/cachix";
|
||||
})
|
||||
(addBuildDepends [
|
||||
self.pqueue
|
||||
])
|
||||
(
|
||||
drv:
|
||||
drv.override {
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
hnix-store-core = self.hnix-store-core_0_8_0_0;
|
||||
}
|
||||
)
|
||||
]
|
||||
# https://github.com/NixOS/nixpkgs/issues/461651
|
||||
++ lib.optional pkgs.stdenv.isDarwin dontCheck
|
||||
);
|
||||
cachix = lib.pipe super.cachix [
|
||||
(overrideSrc {
|
||||
inherit version;
|
||||
src = src + "/cachix";
|
||||
})
|
||||
(addBuildDepends [
|
||||
self.pqueue
|
||||
])
|
||||
(
|
||||
drv:
|
||||
drv.override {
|
||||
nix = self.hercules-ci-cnix-store.nixPackage;
|
||||
hnix-store-core = self.hnix-store-core_0_8_0_0;
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
)
|
||||
|
||||
@@ -335,6 +335,9 @@ self: super:
|
||||
+ (old.preBuild or "");
|
||||
}) super.hercules-ci-agent;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/461651
|
||||
cachix = dontCheck super.cachix;
|
||||
|
||||
# Require /usr/bin/security which breaks sandbox
|
||||
http-reverse-proxy = dontCheck super.http-reverse-proxy;
|
||||
servant-auth-server = dontCheck super.servant-auth-server;
|
||||
|
||||
@@ -14,27 +14,23 @@ let
|
||||
|
||||
# Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`.
|
||||
# This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`.
|
||||
#
|
||||
# Overridings specified through `overridePythonAttrs` will always be applied
|
||||
# before those specified by `overrideAttrs`, even if invoked after them.
|
||||
makeOverridablePythonPackage =
|
||||
f:
|
||||
lib.mirrorFunctionArgs f (
|
||||
origArgs:
|
||||
let
|
||||
args = lib.fix (
|
||||
lib.extends (_: previousAttrs: {
|
||||
passthru = (previousAttrs.passthru or { }) // {
|
||||
overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
|
||||
};
|
||||
}) (_: origArgs)
|
||||
);
|
||||
result = f args;
|
||||
overrideWith = newArgs: args // (if pkgs.lib.isFunction newArgs then newArgs args else newArgs);
|
||||
result = f origArgs;
|
||||
overrideWith = newArgs: origArgs // lib.toFunction newArgs origArgs;
|
||||
in
|
||||
if builtins.isAttrs result then
|
||||
if lib.isAttrs result then
|
||||
result
|
||||
else if builtins.isFunction result then
|
||||
{
|
||||
// {
|
||||
overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs);
|
||||
__functor = self: result;
|
||||
overrideAttrs =
|
||||
newArgs: makeOverridablePythonPackage (args: (f args).overrideAttrs newArgs) origArgs;
|
||||
}
|
||||
else
|
||||
result
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jzvjGLtCnCAXRw4zkoouMTy/dgD8dLgYR4KjcGDbNmo=";
|
||||
hash = "sha256-Qga+nLVpSj0I3Y4Dk7u5s2ISrDp3acJjNiAFXnXGyu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
python-slugify,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
sortedcontainers,
|
||||
@@ -16,16 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blinkpy";
|
||||
version = "0.24.1";
|
||||
version = "0.25.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fronzbot";
|
||||
repo = "blinkpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UjkVpXqGOOwtpBslQB61osaQvkuvD4A+xeUrMpyWetg=";
|
||||
hash = "sha256-K8VnpoKFE2O4FuLliV2CrMQwFkCHbBmu2bFut6Ncmqw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -34,9 +31,9 @@ buildPythonPackage rec {
|
||||
--replace-fail "setuptools>=68,<81" setuptools
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
python-dateutil
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coverage";
|
||||
version = "7.12.0";
|
||||
version = "7.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coveragepy";
|
||||
repo = "coveragepy";
|
||||
tag = version;
|
||||
hash = "sha256-Geoj48/MIrI8YDdyvAz7AaSa9wY41KhW5Ret4pzpLjc=";
|
||||
hash = "sha256-2i01Jlk4oj/0WhoYE1BgeKKjZK3YpEOrGHEgNhTruR4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,22 +12,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "doorbirdpy";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "klikini";
|
||||
repo = "doorbirdpy";
|
||||
tag = version;
|
||||
hash = "sha256-7mA4yyvNPKOGb6Ap7kjCLhR7G1E1CQqgWCtAhciCnR4=";
|
||||
hash = "sha256-2CKjcE3ABjSKWalsXggHFgilhDMAbP4VfkzVNzp7QoY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"tenacity"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
tenacity
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.23.10";
|
||||
version = "0.23.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Q10CjpNd6e5xULziJsBTAcEWMaG68ixBnfHUeOxTyj0=";
|
||||
hash = "sha256-bKyNB2vWhOV6X0BUtoLVaYxAl91UpiRSRPcRywuhkQY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.25.0";
|
||||
version = "2.26.1";
|
||||
tag = "v${version}";
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage {
|
||||
owner = "elevenlabs";
|
||||
repo = "elevenlabs-python";
|
||||
inherit tag;
|
||||
hash = "sha256-H0jq5Hmw433CMA0cWBk6H8I5GNs6eaW0v2cvJNUxxuY=";
|
||||
hash = "sha256-cVqbN2OvzRFmnZojjycGZsGpj26o9rJYGCcfeW56YOY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "essentials";
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neoteroi";
|
||||
repo = "essentials";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SP5DAVsxxoCyKebRfI6sT4IK2/Z1XiGY7Hx3APtbHs0=";
|
||||
hash = "sha256-kKAXCtcl6duVpuGDnSqVfJmfltv9ybU8Gmr3y32Dg9I=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastbencode";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "breezy-team";
|
||||
repo = "fastbencode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fNvxeAKCHjtD9nl7Jhkzecu2CbTfOyPjdYedCPpqYgc=";
|
||||
hash = "sha256-vpo8OVhIm9/niMY6A878FRJ+zU98z9CJe/p5UxmvrLo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-e6TaJyHfrUHampTX42rPqdjQu7myj2+zahVJS+7SzIM=";
|
||||
hash = "sha256-N4diwjHZkJk+Tzu609ueRipfIXyNhXhLG7hpnG1gRa4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,16 +5,13 @@
|
||||
fetchFromGitHub,
|
||||
gitdb,
|
||||
pkgs,
|
||||
pythonOlder,
|
||||
typing-extensions,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gitpython";
|
||||
version = "3.1.45";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpython-developers";
|
||||
@@ -23,18 +20,19 @@ buildPythonPackage rec {
|
||||
hash = "sha256-VHnuHliZEc/jiSo/Zi9J/ipAykj7D6NttuzPZiE8svM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ddt
|
||||
gitdb
|
||||
pkgs.gitMinimal
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace git/cmd.py \
|
||||
--replace 'git_exec_name = "git"' 'git_exec_name = "${pkgs.gitMinimal}/bin/git"'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
ddt
|
||||
gitdb
|
||||
pkgs.gitMinimal
|
||||
];
|
||||
|
||||
# Tests require a git repo
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-cli";
|
||||
version = "0.4.7";
|
||||
version = "0.4.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "cli==${version}";
|
||||
hash = "sha256-VvxY5fXK/f1aCdIB0XPGTsWgEe/cA797kK6eLmb0vtg=";
|
||||
hash = "sha256-qSKqxmypo9p3hcYTl2RtwqCw/+vYmu/HvnauEJi2zkU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/cli";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "momonga";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nbtk";
|
||||
repo = "momonga";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-afPTJH1cVG4Ts6k1GwTJmSZgVZa0ejUERWgNumIUkbs=";
|
||||
hash = "sha256-ZzQPJcvjRuRjU/u8KjxZ0C4XUb4fbVkLIcsf2JmzDRA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-data";
|
||||
version = "1.2.7";
|
||||
version = "1.2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "priv-kweihmann";
|
||||
repo = "oelint-data";
|
||||
tag = version;
|
||||
hash = "sha256-zyZwbyHjZzHGMgnZYMnUiaNd1hEFKQo4jM92C1/3Tvg=";
|
||||
hash = "sha256-gr8GA1mic/XPWSr5ojoOhWCqgIP2CN1fFtPmLddYTz8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -22,9 +22,7 @@
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
coverage,
|
||||
mock,
|
||||
black,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pgmpy";
|
||||
@@ -75,9 +73,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
# xdoctest
|
||||
pytest-cov-stub
|
||||
coverage
|
||||
mock
|
||||
black
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pgmpy" ];
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
torch,
|
||||
hydra-core,
|
||||
iopath,
|
||||
numpy,
|
||||
pillow,
|
||||
torchvision,
|
||||
tqdm,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "sam2";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fg6iUtQ8ENhT46z84LV3CsaDwwSBvW3jETAOnUT0W3Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
torch
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sam2" ];
|
||||
|
||||
dependencies = [
|
||||
hydra-core
|
||||
iopath
|
||||
numpy
|
||||
pillow
|
||||
torch
|
||||
torchvision
|
||||
tqdm
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "SAM 2: Segment Anything in Images and Videos";
|
||||
homepage = "https://github.com/facebookresearch/sam2";
|
||||
license = with lib.licenses; [
|
||||
bsd3
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schedula";
|
||||
version = "1.5.70";
|
||||
version = "1.5.71";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinci1it2000";
|
||||
repo = "schedula";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-F/mP9z+FfcOXZx8neVg5hbCNORaqwrF0jjhcs1jXFEE=";
|
||||
hash = "sha256-Ru9GCdhfC8WU8YxVlpBqxGvoIPhfpl9Zd7cBrom4CL0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smp";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JPHutchins";
|
||||
repo = "smp";
|
||||
tag = version;
|
||||
hash = "sha256-V6TGDG05sebn0IF3j0EbkozfO4X1DL3nnwrGOSh+Wuc=";
|
||||
hash = "sha256-UpzVyZxZjCOWJsQGaRXVwnKjuFISpxNidk0YkNQBqKM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "volkswagencarnet";
|
||||
version = "5.2.8";
|
||||
version = "5.2.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robinostlund";
|
||||
repo = "volkswagencarnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kS7SEyLz1h2uj4T1FGMe2Zc7sS8fN9rT5W5Xsezki4A=";
|
||||
hash = "sha256-rfWlb/R75vt4MNezHZLfFSfATr46Ek3srda0RMGLqko=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -37,7 +37,8 @@ buildPythonPackage rec {
|
||||
http = [
|
||||
flask
|
||||
swagger-ui-py
|
||||
];
|
||||
]
|
||||
++ flask.optional-dependencies.async;
|
||||
zeroconf = [ zeroconf ];
|
||||
};
|
||||
|
||||
|
||||
@@ -2,37 +2,32 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
pnpm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yt-dlp-ejs";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yt-dlp";
|
||||
repo = "ejs";
|
||||
tag = version;
|
||||
hash = "sha256-PoZ7qmrf8en254im2D7fWy9jYiaJwFpq6ZXZP9ouOOQ=";
|
||||
hash = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove when upstream has a lock file we support https://github.com/yt-dlp/ejs/issues/29
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
# we already ran npm install
|
||||
substituteInPlace hatch_build.py \
|
||||
--replace-fail 'subprocess.run(["npm", "install"], check=True, shell=requires_shell)' ""
|
||||
'';
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src postPatch;
|
||||
hash = "sha256-2Xzetr2pb8J2w+ghfoTVP6oZTeVbHV7EcovwxElnUbA=";
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-3hhwKUzfdlKmth4uRlfBSdxEOIfhAVaq2PZIOHWGWiM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -42,7 +37,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
pnpm.configHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "drbd";
|
||||
version = "9.2.15";
|
||||
version = "9.2.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-bKaL7wtjlSbUkLRlMSrGYjab0jdS8lu5bgScTbfpllE=";
|
||||
hash = "sha256-2ff9XtSlUnJG5y6qrRYGTgQiZdEnzywKaKR96ItF8Zw=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
DRBD is a software-based, shared-nothing, replicated storage solution
|
||||
mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts.
|
||||
'';
|
||||
broken = kernel.kernelOlder "5.11" || kernel.kernelAtLeast "6.17";
|
||||
broken = kernel.kernelOlder "5.11";
|
||||
};
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user