Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -527,6 +527,11 @@ lib.mapAttrs mkLicense (
|
||||
fullName = "DOC License";
|
||||
};
|
||||
|
||||
docBookDtd = {
|
||||
spdxId = "DocBook-DTD";
|
||||
fullName = "DocBook DTD License";
|
||||
};
|
||||
|
||||
drl10 = {
|
||||
spdxId = "DRL-1.0";
|
||||
fullName = "Detection Rule License 1.0";
|
||||
|
||||
@@ -4597,6 +4597,12 @@
|
||||
githubId = 9086315;
|
||||
name = "Connor Brewster";
|
||||
};
|
||||
cbrxyz = {
|
||||
email = "me@cbrxyz.com";
|
||||
github = "cbrxyz";
|
||||
githubId = 52760912;
|
||||
name = "Cameron Brown";
|
||||
};
|
||||
ccellado = {
|
||||
email = "annplague@gmail.com";
|
||||
github = "ccellado";
|
||||
|
||||
@@ -110,6 +110,8 @@
|
||||
|
||||
- [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable).
|
||||
|
||||
- [Rustical](https://github.com/lennart-k/rustical), a CalDav/CardDav server aiming to be simple, fast and passwordless. Available as [services.rustical](options.html#opt-services.rustical.enable).
|
||||
|
||||
- [Elephant](https://github.com/abenz1267/elephant), a data provider service and backend for building custom application launchers. Available as [services.elephant](#opt-services.elephant.enable).
|
||||
|
||||
- [Dunst](https://github.com/dunst-project/dunst), a lightweight and customizable notification daemon. Available as [services.dunst](#opt-services.dunst.enable).
|
||||
|
||||
@@ -1768,6 +1768,7 @@
|
||||
./services/web-apps/rimgo.nix
|
||||
./services/web-apps/rss-bridge.nix
|
||||
./services/web-apps/rsshub.nix
|
||||
./services/web-apps/rustical.nix
|
||||
./services/web-apps/rutorrent.nix
|
||||
./services/web-apps/screego.nix
|
||||
./services/web-apps/selfoss.nix
|
||||
|
||||
@@ -36,8 +36,6 @@ let
|
||||
generic = (
|
||||
cfg.server.extraOptions
|
||||
// {
|
||||
user = "root";
|
||||
group = "root";
|
||||
port = cfg.server.listenPort;
|
||||
}
|
||||
// (optionalAttrs (cfg.server.listenAddress != null) {
|
||||
@@ -155,8 +153,8 @@ in
|
||||
before = [ "multi-user.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.nbd}/bin/nbd-server -C ${serverConfig}";
|
||||
Type = "forking";
|
||||
ExecStart = "${pkgs.nbd}/bin/nbd-server -n -C ${serverConfig}";
|
||||
Type = "simple";
|
||||
|
||||
DeviceAllow = map (path: "${path} rw") allowedDevices;
|
||||
BindPaths = boundPaths;
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
iniFmt = pkgs.formats.ini { };
|
||||
in
|
||||
{
|
||||
options.programs.reframe = {
|
||||
options.services.reframe = {
|
||||
enable = lib.mkEnableOption "DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login…";
|
||||
package = lib.mkPackageOption pkgs "reframe" { };
|
||||
configs = lib.mkOption {
|
||||
@@ -113,7 +113,7 @@ in
|
||||
"cpu"
|
||||
"gpu"
|
||||
];
|
||||
default = true;
|
||||
default = "cpu";
|
||||
description = ''
|
||||
Set to `gpu` to use GPU damage region detection, which may be more efficiency but may cause artifacts depending on GPU vendors.
|
||||
Set to `cpu` to use CPU damage region detection if you get bugs with `gpu`.
|
||||
@@ -173,7 +173,7 @@ in
|
||||
description = "ReFrame Remote Desktop";
|
||||
};
|
||||
users.groups.reframe = { };
|
||||
environment.etc = builtins.mapAttrs' (
|
||||
environment.etc = lib.mapAttrs' (
|
||||
name: value:
|
||||
lib.nameValuePair "reframe/${name}.conf" {
|
||||
mode = "0644";
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
mkIf
|
||||
mkEnableOption
|
||||
mkOption
|
||||
mkPackageOption
|
||||
types
|
||||
;
|
||||
|
||||
cfg = config.services.rustical;
|
||||
|
||||
format = pkgs.formats.toml { };
|
||||
configFile = format.generate "rustical.toml" cfg.settings;
|
||||
in
|
||||
|
||||
{
|
||||
options.services.rustical = {
|
||||
enable = mkEnableOption "RustiCali CalDAV/CardDAV server";
|
||||
|
||||
package = mkPackageOption pkgs "rustical" { };
|
||||
|
||||
settings = mkOption {
|
||||
description = ''
|
||||
Your {file}`/etc/rustical/config.toml` as a Nix attribute set.
|
||||
|
||||
Possible options can be found in the [Config struct]. A default
|
||||
configuration can be viewed by running `rustical gen-config`.
|
||||
|
||||
[Config struct]: https://lennart-k.github.io/rustical/_crate/rustical/config/struct.Config.html
|
||||
'';
|
||||
type = types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
data_store.sqlite = {
|
||||
db_url = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/rustical/db.sqlite3";
|
||||
description = ''
|
||||
Path where the sqlite database is stored.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
frontend = {
|
||||
enabled = mkEnableOption "the HTTP frontend" // {
|
||||
default = true;
|
||||
};
|
||||
};
|
||||
|
||||
http = {
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "[::1]";
|
||||
example = "[::]";
|
||||
description = ''
|
||||
Host address to bind the HTTP service to.
|
||||
|
||||
:::{.note}
|
||||
Rustical expects to be hosted behind a reverse proxy that
|
||||
provides HTTPS. Without HTTPS, the web frontend and some clients
|
||||
(e.g. Apple Calendar) may not work.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 4000;
|
||||
description = ''
|
||||
Port to bind the HTTP service to.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
dav_push.enabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to enable [WebDav Push] support.
|
||||
|
||||
This allows the server to notify clients about changed data.
|
||||
|
||||
[WebDav Push]: https://github.com/bitfireAT/webdav-push/
|
||||
'';
|
||||
};
|
||||
|
||||
nextcloud_login.enabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to emulate the Nextcloud login flow.
|
||||
|
||||
This is supported in [DAVx5] and enables automatic app token generation.
|
||||
|
||||
[DAVx5]: https://www.davx5.com/
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environmentFiles = mkOption {
|
||||
type = with types; listOf path;
|
||||
default = [ ];
|
||||
example = [ "/run/keys/rustical.env" ];
|
||||
description = ''
|
||||
Environment files to load into the runtime environment.
|
||||
|
||||
Check the documentation for how to construct [environment variables].
|
||||
|
||||
:::{.tip}
|
||||
Environment variables can substitute any config value and are useful for
|
||||
hiding secrets.
|
||||
:::
|
||||
|
||||
[environment variables]: https://lennart-k.github.io/rustical/installation/configuration/#environment-variables
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# install the config at a path where the cli will find it
|
||||
environment.etc."rustical/config.toml".source = configFile;
|
||||
|
||||
# provide the rustical cli
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.rustical = {
|
||||
description = "RustiCal CalDav/CardDav server";
|
||||
documentation = [ "https://lennart-k.github.io/rustical/" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ configFile ];
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = lib.getExe cfg.package;
|
||||
EnvironmentFile = cfg.environmentFiles;
|
||||
Restart = "on-failure";
|
||||
StateDirectory = "rustical";
|
||||
|
||||
CapabilityBoundingSet = "";
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1469,6 +1469,7 @@ in
|
||||
rtkit = runTest ./rtkit.nix;
|
||||
rtorrent = runTest ./rtorrent.nix;
|
||||
rush = runTest ./rush.nix;
|
||||
rustical = runTest ./web-apps/rustical.nix;
|
||||
rustls-libssl = runTest ./rustls-libssl.nix;
|
||||
rxe = runTest ./rxe.nix;
|
||||
sabnzbd = runTest ./sabnzbd.nix;
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
''
|
||||
start_all()
|
||||
|
||||
harmonia.wait_for_unit("harmonia.service")
|
||||
harmonia.wait_for_unit("harmonia.socket")
|
||||
|
||||
client01.wait_until_succeeds("curl -f http://harmonia:5000/nix-cache-info | grep '${toString nodes.harmonia.services.harmonia.cache.settings.priority}' >&2")
|
||||
client01.succeed("curl -f http://harmonia:5000/version | grep '${nodes.harmonia.services.harmonia.package.version}' >&2")
|
||||
|
||||
@@ -180,7 +180,7 @@ in
|
||||
|
||||
start_all()
|
||||
|
||||
harmonia.wait_for_unit("harmonia.service")
|
||||
harmonia.wait_for_unit("harmonia.socket")
|
||||
|
||||
ncps0.wait_for_unit("ncps.service")
|
||||
ncps1.wait_for_unit("ncps.service")
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
''
|
||||
start_all()
|
||||
|
||||
harmonia.wait_for_unit("harmonia.service")
|
||||
harmonia.wait_for_unit("harmonia.socket")
|
||||
|
||||
ncps.wait_for_unit("ncps.service")
|
||||
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
name = "rustical";
|
||||
|
||||
meta.maintainers = pkgs.rustical.meta.maintainers;
|
||||
|
||||
nodes.machine =
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.rustical.enable = true;
|
||||
environment.systemPackages = with pkgs; [ calendar-cli ];
|
||||
};
|
||||
|
||||
testScript =
|
||||
{
|
||||
nodes,
|
||||
...
|
||||
}:
|
||||
let
|
||||
port = toString nodes.machine.services.rustical.settings.http.port;
|
||||
url = "http://localhost:${toString port}";
|
||||
|
||||
createPrincipalScript = pkgs.writeScript "rustical-create-principal" ''
|
||||
#!${lib.getExe pkgs.expect}
|
||||
spawn rustical principals create alice --password
|
||||
expect "Enter your password:\r"
|
||||
send "foobar\r"
|
||||
expect eof
|
||||
'';
|
||||
|
||||
calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" {
|
||||
default = {
|
||||
caldav_user = "alice";
|
||||
caldav_url = "${url}/caldav/";
|
||||
calendar_url = "${url}/caldav/principal/alice";
|
||||
};
|
||||
testcal = {
|
||||
inherits = "default";
|
||||
calendar_url = "${url}/caldav/principal/alice/testcal";
|
||||
};
|
||||
};
|
||||
in
|
||||
# python
|
||||
''
|
||||
machine.wait_for_unit("rustical.service")
|
||||
machine.wait_for_open_port(${port})
|
||||
|
||||
with subtest("Smoketest"):
|
||||
machine.succeed("curl --fail ${url}")
|
||||
|
||||
with subtest("Create principal"):
|
||||
machine.succeed("${createPrincipalScript}")
|
||||
machine.succeed("rustical principals list | grep alice")
|
||||
|
||||
with subtest("Generate token for principal"):
|
||||
machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login")
|
||||
machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt")
|
||||
|
||||
with subtest("Interact with caldav"):
|
||||
machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal')
|
||||
machine.succeed('calendar-cli --config-file ${calendarCliConfig} --config-section testcal --caldav-pass "$(cat token.txt)" calendar add 2013-10-01 testevent')
|
||||
|
||||
machine.log(machine.execute("systemd-analyze security rustical.service | grep -v ✓")[1])
|
||||
'';
|
||||
}
|
||||
@@ -1760,8 +1760,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.39.0";
|
||||
hash = "sha256-kOzr8YjwHdA3Tgo4JeEAWda4tBrXjMQNBITNhmy9cP4=";
|
||||
version = "0.40.3";
|
||||
hash = "sha256-NGC6uW1biseqQ04fD3K4mK4D4rcGVqt0LBlGFC1Exu8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
@@ -4530,8 +4530,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "109.15.0";
|
||||
hash = "sha256-/1we+6X3l7MCx96ELz7wg6oDDAcYCJBt7XJ4X0ihwx0=";
|
||||
version = "110.0.0";
|
||||
hash = "sha256-l5L0uqHpBR6nWzr8/edz3EU8+BP9yqRRFhpnngG0RGY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
||||
@@ -26,8 +26,8 @@ let
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-mr5GwwfuNoLhKM5bAhNAO3j0ow4FcyZhvQlVnAENoyg=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -25,8 +25,8 @@ let
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-kQjxcqHEClQtG6x2QM1/zixN6rvcEivX8vicNydDdOw=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -328,13 +328,13 @@
|
||||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"dnsimple_dnsimple": {
|
||||
"hash": "sha256-pbc7jLhIm+ogcpCBhi4CVsr2qM5vDzH0QuP3+cEVYLw=",
|
||||
"hash": "sha256-j3O1gztyDCiq0Rchcx1lYktY2EhaNaa3t1yL+lH7IAg=",
|
||||
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
|
||||
"owner": "dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v2.0.1",
|
||||
"rev": "v2.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-DRMbcAR+DDrxrg1jNgnoWUg+OjlKm7wkqgIN6Hhkp3U="
|
||||
"vendorHash": "sha256-1CpswocnTe6aj4TP7fMGy6mv0d/yX8FcYAKkAW5k7kk="
|
||||
},
|
||||
"dnsmadeeasy_dme": {
|
||||
"hash": "sha256-JH9YcM9Fvd1x0BJpLUZCm6a9hZZxySrkFVLP89FO3fU=",
|
||||
@@ -715,11 +715,11 @@
|
||||
"vendorHash": "sha256-fWnf2l9a7bzXtofA+Aow6F17K+slpMpXEYZPuqDNwfg="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-Eg811AwJwuHZ/270+TNh6JskCGRUt0ikk6yShjtVtcU=",
|
||||
"hash": "sha256-CtqPtXccE6I+yDj/7XbjbACMwCGMv+pSEIa5DVh+AGo=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.90.0",
|
||||
"rev": "v1.91.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
+2
-2
@@ -45,14 +45,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "6.7.6";
|
||||
version = "6.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-TGI1SLtzjjDaodQc+JIVRRiwCy9PCO3MuPfv2DpDFxo=";
|
||||
hash = "sha256-lcIkkr9i/zVRNNQ3qi6O6xIgtpQgkVWOGIttHqmAQv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -52,6 +52,9 @@ installFonts() {
|
||||
if [ -n "${webfont-}" ]; then
|
||||
installFont 'woff' "$webfont/share/fonts/woff"
|
||||
installFont 'woff2' "$webfont/share/fonts/woff2"
|
||||
elif [[ "${dontInstallWebfonts-}" != 1 && -n "$(find . \( -iname "*.woff" -o -iname "*.woff2" \) -print)" ]]; then
|
||||
nixErrorLog "Consider adding \"webfont\" to outputs to install woff/woff2 files."
|
||||
nixErrorLog "Alternatively, set dontInstallWebfonts to silence this."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.3.11";
|
||||
version = "3.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jksC63DFSbZcBjQvV7BBMSMbPMeSqUQMWN9HcIcFZSU=";
|
||||
hash = "sha256-U6vEQwlj0jNYnkZyZmmelEf/WJIHmaffJ+Y1NRU0IiI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildGoModule,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -35,6 +36,8 @@ buildGoModule (finalAttrs: {
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/tjblackheart/andcli";
|
||||
description = "2FA TUI for your shell";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "astartectl";
|
||||
version = "24.5.3";
|
||||
version = "26.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astarte-platform";
|
||||
repo = "astartectl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wziSP4mbUnAAPzmkl1qXbT95Ku/M9rMb63s/5ndCXrk=";
|
||||
hash = "sha256-mRPy5nnj/1T3tnii+Z9QmL6kZba2Wom/jGncp+ZynFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TZ0ua64DPVlGBrr4ZCexBoyuwvJzRr1t37BTJ2bLuQI=";
|
||||
vendorHash = "sha256-Yz6Ph6TqyWlEXnkW/g1DDqxaqTM9DJrnO+QJgzqjVhw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
prePnpmInstall
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-DFoIq5+cKqnmWLJ6CHhfdQEAGjvpu72qb1CSWaExODI=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-1kdXt0Wc/ON//hwBYozRSMAyKQqEfSMfOI7XJyd9MBc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+3
-3
@@ -8,11 +8,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "babashka-unwrapped";
|
||||
version = "1.12.217";
|
||||
version = "1.12.218";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
|
||||
sha256 = "sha256-5Nnzx2chre+h0SnM5spwiR9r4gjlyfc2FbgYa0spM34=";
|
||||
sha256 = "sha256-CEApb2noPYfRYRDTo1RBLOZELvEuxGO4HW1CB//bky8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
@@ -69,7 +69,7 @@ buildGraalvmNativeImage (finalAttrs: {
|
||||
| ${lib.getExe finalAttrs.finalPackage} -I -o -e "(or (some->> *input* (filter #(= '(def version) (take 2 %))) first last last last) (throw (ex-info \"Couldn't find expected '(def version ...)' form in 'borkdude/deps.clj'.\" {})))")
|
||||
|
||||
update-source-version babashka.clojure-tools "$clojure_tools_version" \
|
||||
--file="pkgs/development/interpreters/babashka/clojure-tools.nix"
|
||||
--file="pkgs/by-name/ba/babashka/clojure-tools.nix"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
+3
-3
@@ -1,16 +1,16 @@
|
||||
# This file tracks the Clojure tools version required by babashka.
|
||||
# See https://github.com/borkdude/deps.clj#deps_clj_tools_version for background.
|
||||
# The `updateScript` provided in default.nix takes care of keeping it in sync, as well.
|
||||
# The `updateScript` provided in babashka-unwrapped takes care of keeping it in sync, as well.
|
||||
{
|
||||
clojure,
|
||||
fetchurl,
|
||||
}:
|
||||
clojure.overrideAttrs (previousAttrs: {
|
||||
pname = "babashka-clojure-tools";
|
||||
version = "1.12.4.1597";
|
||||
version = "1.12.4.1618";
|
||||
|
||||
src = fetchurl {
|
||||
url = previousAttrs.src.url;
|
||||
hash = "sha256-DgEvXVExaexDTLoonh/fVS5nHjgekL6BlFYLM9X6wkM=";
|
||||
hash = "sha256-E3adptY6mN6yAkN4rhpk5O4hGsEDU0DfynppRMQc3iE=";
|
||||
};
|
||||
})
|
||||
@@ -15,10 +15,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bitlbee-steam";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${finalAttrs.version}";
|
||||
owner = "bitlbee";
|
||||
repo = "bitlbee-steam";
|
||||
sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WPUelgClqGiKmClIkGEMaBbtUrBlwN85L4Rs/qpIOYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
# Source uses `bool` as a variable name, reserved in C23.
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
meta = {
|
||||
description = "Steam protocol plugin for BitlBee";
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buf";
|
||||
version = "1.68.4";
|
||||
version = "1.69.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qxTRUYt2JKBE5WvfXlMsdXMJtrD9MLnMjy6+3PMkpvo=";
|
||||
hash = "sha256-x8Dj4xl67Jq0ViWu+Tz+3lAnfIpE926dIr+oe4ul0gI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aQ4yWdHUmb0LaJ33T2vuVDS1UhYmBUYcwkbnkN7DOqQ=";
|
||||
vendorHash = "sha256-zhXpWpYd/bim5f4EQJujVm072LPgBusjCFGYAwK10HE=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
diff --git a/private/buf/buftesting/buftesting.go b/private/buf/buftesting/buftesting.go
|
||||
index 1c650077..5422f703 100644
|
||||
index 1b5557d..cec5736 100644
|
||||
--- a/private/buf/buftesting/buftesting.go
|
||||
+++ b/private/buf/buftesting/buftesting.go
|
||||
@@ -106,6 +106,10 @@ func RunActualProtoc(
|
||||
@@ -100,6 +100,10 @@ func RunActualProtoc(
|
||||
|
||||
// GetGoogleapisDirPath gets the path to a clone of googleapis.
|
||||
func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string {
|
||||
func GetGoogleapisDirPath(tb testing.TB, buftestingDirPath string) string {
|
||||
+ // Requires network access, which is not available during
|
||||
+ // the nixpkgs sandboxed build
|
||||
+ t.Skip()
|
||||
+ tb.Skip()
|
||||
+
|
||||
googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath)
|
||||
require.NoError(
|
||||
t,
|
||||
tb,
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkite-agent";
|
||||
version = "3.121.0";
|
||||
version = "3.124.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QlslPoLpqzuX05bp58xz/3Vhj0imEqCleO1hhe1PPXM=";
|
||||
hash = "sha256-HdTMsCBvd3vN/OkpBpiJ7dXq50PXx165NWmKGGpikUQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rv5CqNpjmXhGcZ3KQBX0Z2428upWBUVkdRjEG4QWEoY=";
|
||||
vendorHash = "sha256-VE7YEBIrkDG1ERGXnib0LPjBWcrepGAqwY5yKzSQ6wg=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash
|
||||
@@ -59,9 +59,6 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests.smoke-test = nixosTests.buildkite-agents;
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -80,6 +77,7 @@ buildGoModule (finalAttrs: {
|
||||
zimbatm
|
||||
jsoo1
|
||||
techknowlogick
|
||||
cbrxyz
|
||||
];
|
||||
platforms = with lib.platforms; unix ++ darwin;
|
||||
};
|
||||
|
||||
@@ -23,8 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-rI0DhnncVWd4Wp5pvTnL8IerXbFDwJzkhC4uIe6WJto=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -54,6 +54,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
# E + where '' = <castero.menus.episodemenu.EpisodeMenu object at 0x7ffff3acd0d0>.metadata
|
||||
# E + and <MagicMock name='mock.metadata' id='140737279137104'> = episode1.metadata
|
||||
"test_menu_episode_metadata"
|
||||
# flaky: segfaults on Hydra when a background DB reload thread races the test
|
||||
"test_perspective_downloaded_draw_metadata"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -37,8 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-o5pNgn+ZqaEfsWO97jXkRyPH+0pffR6TBZcF6nApWVg=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-o7u/ZZS/5PgOtWd07zO4a01mUWZowUTL+JDJ2442mGc=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-UKSIfn2iR8Ydk9ViGCgWtspZr1FjTeW49UMwTcL57UA=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-O/Uz+eG8FT3nsXGRqcRdREXNaGlTpyVgUBmNsH7tLJA=";
|
||||
hash = "sha256-EgGjlZ6Awg7SEC3ljPqii3wpq2SlXN/gARUJBSFcX0k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-aps8j9Vx1LZQAWHuWmnAusCJfAuzREM+GyKdybw+Hcc=";
|
||||
npmDepsHash = "sha256-1v9c1525J7aS89PDdl6hWbYdn/DIM3G1BxFbpxu/F7E=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coal";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coal-library";
|
||||
repo = "coal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7Ww1vAzKaCccBpBQU1hzI7Jk+oXw73zhnH594Xn9gbw=";
|
||||
hash = "sha256-2fmu2VZJ+Fd87q2RpnJU61v6Lj2C9r5iweFrr1HwQQI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmWorkspaces
|
||||
;
|
||||
pnpm = pnpm_8;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-wQ9dcqY7BVXc7wpsHlYNpc7utL1+MkdTCu77Wh8+QWc=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-h/ND/665MpcPaDIR1Bb5iPrHmoNysr9vuFk1I0fFP34=";
|
||||
};
|
||||
|
||||
pnpmWorkspaces = [ "coc-cmake" ];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
acl,
|
||||
bash,
|
||||
buildPackages,
|
||||
cockpit,
|
||||
coreutils,
|
||||
fetchFromGitHub,
|
||||
@@ -13,6 +14,7 @@
|
||||
makeWrapper,
|
||||
mbuffer,
|
||||
msmtp,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
openssh,
|
||||
samba,
|
||||
@@ -28,19 +30,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-zfs";
|
||||
version = "1.2.12-2";
|
||||
version = "1.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "45Drives";
|
||||
repo = "cockpit-zfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-oeXSOxogfAazRsKfngq2+DOyo//wRJQSqm7gaCza4WY=";
|
||||
hash = "sha256-d1wurTha4LIe01oogJZHfLdTvBnEsNG9sGO8CfyS+GE=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
# Use buildPackages for cross-compilation support
|
||||
offlineCache = buildPackages.yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-YnR1SqBGnxEQaGUGMNTHHEGcOIhuGbWnqMdr4eRGXcA=";
|
||||
};
|
||||
@@ -50,9 +53,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nodejs
|
||||
jq
|
||||
yarn-berry
|
||||
yarn-berry.yarnBerryConfigHook
|
||||
buildPackages.yarn-berry.yarnBerryConfigHook
|
||||
];
|
||||
|
||||
disallowedRequisites = [ finalAttrs.offlineCache ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
passthru.cockpitPath = [
|
||||
acl
|
||||
bash
|
||||
@@ -82,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
};
|
||||
|
||||
patchPhase =
|
||||
postPatch =
|
||||
let
|
||||
# houston-common-lib has @types/electron which pulls in electron.
|
||||
# Electron's postinstall downloads binaries, which fails in sandbox.
|
||||
@@ -91,8 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
houstonUiDir = "houston-common/houston-common-ui";
|
||||
in
|
||||
''
|
||||
runHook prePatch
|
||||
|
||||
# Remove electron type dependency
|
||||
substituteInPlace ${houstonLibDir}/package.json \
|
||||
--replace-fail '"@types/electron": "^1.6.12",' ""
|
||||
@@ -116,8 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace-fail "VueDevTools()," "" \
|
||||
--replace-fail "import dts from 'vite-plugin-dts'" ""
|
||||
sed -i '/dts({/,/})/d' ${houstonUiDir}/vite.config.ts
|
||||
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-vOZnVCz5lFdVD2qmlHdTRxzuEjpR3W/rXfzvjvdOh9E=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crd2pulumi";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "crd2pulumi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-0D5U3Ie9h5R0kTLb5YHshtYrwuoXxPX0fYAJGqUw35w=";
|
||||
sha256 = "sha256-0BnDN1D1g/LdYqLw1It5a/jG2g6/kBb4F64NEI5xFeA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mO1DgyasJFYpRxeTd8Dinn1mcddCjTiUqs54WD31V/w=";
|
||||
vendorHash = "sha256-cbJ0jZtJhVz3b1jdsLiwNBHqRUHk29haJ+YzShcTfJg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
From 7c83c012b33a16b11e3547894118fc013ec23ca0 Mon Sep 17 00:00:00 2001
|
||||
From: Willy <jemand771@gmx.net>
|
||||
Date: Tue, 5 May 2026 13:50:44 +0200
|
||||
Subject: [PATCH] add missing cstring include
|
||||
|
||||
fails on newer compilers/toolchains without
|
||||
---
|
||||
src/cre2.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/cre2.cpp b/src/cre2.cpp
|
||||
index 5a63b93..3b1ec21 100644
|
||||
--- a/src/cre2.cpp
|
||||
+++ b/src/cre2.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
+#include <cstring>
|
||||
#include <vector>
|
||||
@@ -20,6 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./missing-header-include-pr-34.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
libtool
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "croc";
|
||||
version = "10.4.2";
|
||||
version = "10.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = "croc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JZV02QZAS4OhnFdEB/EKm2FL0o4VmNSJIWNBdmIIdrE=";
|
||||
hash = "sha256-cQgGs4vv7RGa9reM3QoYDW6PdREx+rIzg4uXXrahPSg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/qPBHpCdEu1uBFFwE7uzmCcm4EL8TxUWdjiaFlUSxIU=";
|
||||
vendorHash = "sha256-qS+jjchXysIj4ZcZoUWg8W0uyYTYPPy8DdhZEP/uZGg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmWorkspaces
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-EKnczZ/7O2ZMaSlIFfLk9WXyf/ubynhmecs+IyIoTHw=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-eQ9KiRSwWmfhCinYVP4ulQdAG6SOd9yyyOUWSwc5TV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-asn-lite";
|
||||
version = "2026-04";
|
||||
version = "2026-05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-wJA6XqFbVxsWNEJ4AzwiKMOjsayJczVU/L3i98Y1x+I=";
|
||||
hash = "sha256-14Gx6w1BzS+3+xz6CiJ3OMm3KgvU2pf+z9TOiydky4U=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-city-lite";
|
||||
version = "2026-04";
|
||||
version = "2026-05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-sIb1DGVNmvV0B3ltTcT4yQkMMMiZt89X0eDIzT0U/r8=";
|
||||
hash = "sha256-lSDMjGXcBMr8iGgqyJ26LPu8tfaG6QlKsCH88q4sAvA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbip-country-lite";
|
||||
version = "2026-04";
|
||||
version = "2026-05";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
|
||||
hash = "sha256-d+6Bq1l6XZHI+maW20SmpXjfP9O1a4FmhtfL3poEOfs=";
|
||||
hash = "sha256-I0aw3Sk+hZf4n7nvTiy0GEKVkHIx/URgwkAgSW8o7fo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -77,9 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
fetcherVersion = 3;
|
||||
sourceRoot = "source";
|
||||
hash = "sha256-fFcKyqAo/HpGBaEJMk6Lq0FafNXrGu9z9nHnav5d6Hg=";
|
||||
hash = "sha256-6lMTvlkIeM9kkbFhHzS9jJsHk2bVZWZs6GPgn+X3Rss=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -50,8 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-+Mxf/D66EoE/axKg5+TSaLFPSpUEDZNtSNH4zklxV5s=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-UZ6/OTUtIiOA1D5PanY4aS+VCBNj/AIbIGYe1eibGMQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "di-tui";
|
||||
version = "1.13.4";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acaloiaro";
|
||||
repo = "di-tui";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0PIKPprAqGbVFiGFxwzgmS4fYKTHfpdpWWUMuxK67tQ=";
|
||||
hash = "sha256-P784Tf3XA/28PgKTr89yizKAX1MhAb4877gV7vVHBYE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
|
||||
|
||||
@@ -9,15 +9,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnsenum";
|
||||
version = "1.2.4.2";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwaeytens";
|
||||
repo = "dnsenum";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "1bg1ljv6klic13wq4r53bg6inhc74kqwm3w210865b1v1n8wj60v";
|
||||
owner = "SparrowOchon";
|
||||
repo = "dnsenum2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-I4I+HNQC7xqIF2P7NBy2Ophh3znl5qy9fSicJKIBUis=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
rm Makefile
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with perlPackages; [
|
||||
perl
|
||||
NetDNS
|
||||
@@ -35,11 +39,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -vD dns.txt -t $out/share
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/dnsenum \
|
||||
--prefix PERL5LIB : "${
|
||||
with perlPackages;
|
||||
makePerlPath [
|
||||
NetIP
|
||||
NetDNS
|
||||
NetNetmask
|
||||
StringRandom
|
||||
XMLWriter
|
||||
NetWhoisIP
|
||||
WWWMechanize
|
||||
]
|
||||
}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/fwaeytens/dnsenum";
|
||||
homepage = "https://github.com/SparrowOchon/dnsenum2";
|
||||
description = "Tool to enumerate DNS information";
|
||||
mainProgram = "dnsenum";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -71,8 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
nativeBuildInputs = [ gitMinimal ];
|
||||
pnpm = pnpm';
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-q0+6vkDZdcDXwsTxby2RuQUYTgEnxGx1CeXROSrG9lU=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-gP/0WeVp+Y8QgPmAmbFt+cInX6+4oxPIYlwFpSh2hPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,6 +15,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-WMgqDc+XAY3g2wwlefjJ0ATxR5r/jL971FZKtxsunnU=";
|
||||
};
|
||||
|
||||
# tests call no-arg-declared functions with args; pre-C23 allows it
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
||||
@@ -2,19 +2,23 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
openssl,
|
||||
tcl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eggdrop";
|
||||
version = "1.9.5";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor finalAttrs.version}/eggdrop-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4mkY6opk2YV1ecW2DGYaM38gdz7dgwhrNWUlvrWBc2o=";
|
||||
hash = "sha256-pc33RE14HC/09dC+FCAvXQlx4AOHGBpJtyUFf+lTEtU=";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
tcl
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -37,5 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.unix;
|
||||
homepage = "https://www.eggheads.org";
|
||||
description = "Internet Relay Chat (IRC) bot";
|
||||
maintainers = with lib.maintainers; [ EpicEric ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "esphome";
|
||||
version = "2026.4.3";
|
||||
version = "2026.4.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+esSczOBIT4dJEyzqmEv6YMU4wGkN4lFGmuZKRp5/bo=";
|
||||
hash = "sha256-uMlkrHg4cZYsdSv8D8U57mEZnjwcRkJe2zKI8VFsTRk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -186,6 +186,9 @@ python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
# Expects a full git clone
|
||||
"test_clang_tidy_mode_full_scan"
|
||||
"test_clang_tidy_mode_targeted_scan"
|
||||
# Patched to run platformio without the esphome wrapper
|
||||
"test_run_platformio_cli_strips_win_long_path_prefix"
|
||||
"test_run_platformio_cli_does_not_set_pythonexepath_without_strip"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
|
||||
index fc21977f..e5059f1d 100644
|
||||
index 81ff01306..2dfa523dd 100644
|
||||
--- a/esphome/platformio_api.py
|
||||
+++ b/esphome/platformio_api.py
|
||||
@@ -63,7 +63,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int:
|
||||
os.environ.setdefault("PYTHONWARNINGS", "ignore::SyntaxWarning")
|
||||
# Increase uv retry count to handle transient network errors (default is 3)
|
||||
os.environ.setdefault("UV_HTTP_RETRIES", "10")
|
||||
- cmd = [sys.executable, "-m", "esphome.platformio_runner"] + list(args)
|
||||
@@ -64,7 +64,7 @@ def run_platformio_cli(*args, **kwargs) -> str | int:
|
||||
# a user-provided value (or the unmodified path on platforms that
|
||||
# don't need the strip).
|
||||
os.environ["PYTHONEXEPATH"] = python_exe
|
||||
- cmd = [python_exe, "-m", "esphome.platformio_runner"] + list(args)
|
||||
+ cmd = ["platformio"] + list(args)
|
||||
|
||||
|
||||
return run_external_process(*cmd, **kwargs)
|
||||
|
||||
|
||||
|
||||
@@ -4,23 +4,25 @@
|
||||
python3Packages,
|
||||
xhost,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "exegol";
|
||||
version = "5.1.10";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThePorgs";
|
||||
repo = "Exegol";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-iyzTBZHOzr6CfZDqHvycdWZply/BXH7kESaO5pDLBMY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ pdm-backend ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rich"
|
||||
"argcomplete"
|
||||
"requests"
|
||||
"rich"
|
||||
"supabase"
|
||||
];
|
||||
|
||||
@@ -41,7 +43,9 @@ python3Packages.buildPythonApplication rec {
|
||||
]
|
||||
++ pyjwt.optional-dependencies.crypto
|
||||
++ [ xhost ]
|
||||
++ lib.optional (!stdenv.hostPlatform.isLinux) tzlocal;
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux) [
|
||||
tzlocal
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -58,7 +62,7 @@ python3Packages.buildPythonApplication rec {
|
||||
stylish macOS users and corporate Windows pros to UNIX-like power users.
|
||||
'';
|
||||
homepage = "https://github.com/ThePorgs/Exegol";
|
||||
changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
gpl3Only
|
||||
{
|
||||
@@ -76,4 +80,4 @@ python3Packages.buildPythonApplication rec {
|
||||
macbucheron
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fence";
|
||||
version = "0.1.54";
|
||||
version = "0.1.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Use-Tusk";
|
||||
repo = "fence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Um9nIg+lXNfp8vBeLlCUYlJNtPIemnyenz7+L9dfcjg=";
|
||||
hash = "sha256-YX+DqD20hr/+hAXLVddEQjj0J7jybhNNdtQM3tlSPek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qct/M0zuggYzlN0gyO8nF58M5Av3HcYyMjrPab5Crr0=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "figurine";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arsham";
|
||||
repo = "figurine";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-1q6Y7oEntd823nWosMcKXi6c3iWsBTxPnSH4tR6+XYs=";
|
||||
hash = "sha256-U25nbXr8SuSgMq1Nqk/7Ci4tKoWAyccv8j4aTIEox3k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mLdAaYkQH2RHcZft27rDW1AoFCWKiUZhh2F0DpqZELw=";
|
||||
vendorHash = "sha256-CdiHPN0zfOedsz2M6JWFMQpG70vxLbKj//WkKyN58AQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.63.2";
|
||||
version = "2.63.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pAD7mEiDQyfmKmClO9oMLgPua0jOrcImiQrSGLvhCEA=";
|
||||
hash = "sha256-v3cC8opClvt91MqUIKNZdvCv0hPeCvWPi0IlOMHlWbQ=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -41,7 +41,7 @@ let
|
||||
;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
hash = "sha256-0n2HxluqIcCzo1QA5D/YRCk5+mbTntLA8PFxZAC3YA8=";
|
||||
hash = "sha256-g8BWDEymQNOkLYBws0ii4iLnpjB7X4EQl0OzR3GXeq0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -59,7 +59,7 @@ buildGoModule {
|
||||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-YM/aIx1gDhFAKNNZmXvG3AVd4xSNC8AHIya4Gyeq9/Y=";
|
||||
vendorHash = "sha256-ofeQkbvBfCpu2g1CLAwUZAZISyAOz+0smEZRx/koj/8=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
||||
@@ -3,18 +3,19 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
zsh,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fzf-zsh-plugin";
|
||||
version = "1.0.0-unstable-2025-12-15";
|
||||
version = "1.0.0-unstable-2026-03-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unixorn";
|
||||
repo = "fzf-zsh-plugin";
|
||||
rev = "cdd9d5cc3b41a3a390a0fb8605c40de652da6309";
|
||||
hash = "sha256-i6qoaMWVofhD3K6/RaaNatzA2aokiNQ5ilqmahprJFU=";
|
||||
rev = "d56d2387ce376f80e42c46654a9ee1f899a40b46";
|
||||
hash = "sha256-twry9z9gDvRfH3AOWEV/a9HX4pnlMJDSw74Sm/MBwIk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -33,6 +34,8 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/unixorn/fzf-zsh-plugin";
|
||||
description = "ZSH plugin to enable fzf searches of a lot more stuff - docker, tmux, homebrew and more";
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
|
||||
index 1120c0309..62e6177ab 100644
|
||||
--- a/contrib/CMakeLists.txt
|
||||
+++ b/contrib/CMakeLists.txt
|
||||
@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES)
|
||||
@@ -87,7 +87,7 @@ endif (INSTALL_PHP_EXAMPLES)
|
||||
if (INSTALL_BASH_COMPLETION)
|
||||
macro_optional_find_package (BashCompletion)
|
||||
if (NOT BASH_COMPLETION_FOUND)
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
diff --git a/utils/gammu-config b/utils/gammu-config
|
||||
index abf278ada..fc12493cd 100755
|
||||
--- a/utils/gammu-config
|
||||
+++ b/utils/gammu-config
|
||||
@@ -59,16 +59,7 @@
|
||||
@@ -59,16 +59,7 @@ while [ "$#" -ge 1 ] ; do
|
||||
shift
|
||||
done
|
||||
|
||||
-if type dialog > /dev/null 2>&1 ; then
|
||||
-if command -v dialog > /dev/null 2>&1 ; then
|
||||
- DIALOG=dialog
|
||||
-elif type cdialog > /dev/null 2>&1 ; then
|
||||
-elif command -v cdialog > /dev/null 2>&1 ; then
|
||||
- DIALOG=cdialog
|
||||
-elif type whiptail > /dev/null 2>&1 ; then
|
||||
-elif command -v whiptail > /dev/null 2>&1 ; then
|
||||
- DIALOG=whiptail
|
||||
-else
|
||||
- echo "You need dialog, cdialog or whiptail installed to make this work"
|
||||
|
||||
@@ -24,13 +24,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gammu";
|
||||
version = "1.42.0";
|
||||
version = "1.43.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gammu";
|
||||
repo = "gammu";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
|
||||
sha256 = "sha256-+mZBELwFUEL4S3IUIIa83TaNIYQxjQE1TvWhXTcIfYc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -33,8 +33,8 @@ buildGoModule (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs') pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-8eQhR/fuDFNL8W529Ev7piCaseVaFahgZJQk3AJA3ng=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-z/Y9q/SE2c/KYzIOAfATlprjr6NjmmUHQB+ZbO39OK4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-town";
|
||||
version = "22.7.1";
|
||||
version = "23.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MGiWqFWA4PMyGL7QqgcDWrgM/Wo8us8GMhdsrXBgWmg=";
|
||||
hash = "sha256-Bk3m9/AMo+1xxz97hNEd+wDdvCep/BwUA5Ps1VYIdfk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -58,8 +58,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-0WLgtidG8hqTkXY3heu+m3VoqQD/kGMlTmLb0qAS8sQ=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-uK3CNyPewUVAmqBJq1WMCrNeMP5I18BEBkZIBP0qPsI=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "golazo";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xjuanma";
|
||||
repo = "golazo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hrdiNccvIgX9v187l4Htc7viqOb1lGgxOkeLJgFyF4M=";
|
||||
hash = "sha256-MSFH6IuSeMi98Ri/YVIxLFn7eYozodosfk8ZYz+Q2K0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M2gfqU5rOfuiVSZnH/Dr8OVmDhyU2jYkgW7RuIUTd+E=";
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
libgit2,
|
||||
zlib,
|
||||
cmake,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -15,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmrDeveloper";
|
||||
repo = "GQL";
|
||||
rev = finalAttrs.version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fTmCL8b9Yp0DwgatGd7ODpq3z9b3Rqg/skqvjQkZvOU=";
|
||||
};
|
||||
|
||||
@@ -31,12 +33,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
zlib
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "SQL like query language to perform queries on .git files";
|
||||
homepage = "https://github.com/AmrDeveloper/GQL";
|
||||
changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${finalAttrs.src.rev}";
|
||||
changelog = "https://github.com/AmrDeveloper/GQL/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.progrm_jarvis ];
|
||||
mainProgram = "gitql";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
alsa-lib,
|
||||
avahi,
|
||||
boost,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
fftwFloat,
|
||||
freetype,
|
||||
glib,
|
||||
glibmm,
|
||||
lib,
|
||||
libsndfile,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
lilv,
|
||||
ncurses,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "guitarix-vst";
|
||||
version = "0.5";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "guitarix.vst";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SuKPTdYt9sFAZGFsf5P6nl4lzTOirOTOeRoCJEMH76w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Builds/LinuxMakefile/Makefile \
|
||||
--replace-fail '$(shell arch)' '${stdenv.hostPlatform.uname.processor}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
ncurses
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
avahi
|
||||
boost
|
||||
curl
|
||||
fftwFloat
|
||||
freetype
|
||||
glib
|
||||
glibmm
|
||||
libx11
|
||||
libxcursor
|
||||
libxext
|
||||
libxinerama
|
||||
libxrandr
|
||||
lilv
|
||||
libsndfile
|
||||
];
|
||||
|
||||
installFlags = [ "JUCE_VST3DESTDIR=${placeholder "out"}/lib/vst3" ];
|
||||
|
||||
meta = {
|
||||
description = "Versatile (guitar) amplifier VST3 plugin";
|
||||
homepage = "https://github.com/brummer10/guitarix.vst";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ lib.maintainers.eymeric ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ha-mcp";
|
||||
version = "7.3.0";
|
||||
version = "7.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeassistant-ai";
|
||||
repo = "ha-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-boWqv8lSN/UiqSRhVBgbucX+RC6q14Oa4WzkJPeZzVw=";
|
||||
hash = "sha256-F13BoZinPnv+tlkiVnG7iAkr2JdEbFE0RIEgmHa/yq4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchDebianPatch,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
@@ -48,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/LonnyGomes/hexcurse/commit/cb70d4a93a46102f488f471fad31a7cfc9fec025.patch";
|
||||
sha256 = "19674zhhp7gc097kl4bxvi0gblq6jzjy8cw8961svbq5y3hv1v5y";
|
||||
})
|
||||
|
||||
# Fix build with GCC 15 (old-style function definitions)
|
||||
(fetchDebianPatch {
|
||||
pname = "hexcurse";
|
||||
version = "1.60.0";
|
||||
debianRevision = "1";
|
||||
patch = "gcc-15.patch";
|
||||
hash = "sha256-nWwYjI18fsJ9LSby6OJoJ0QXENgyVbUY3LpEYWoCBkI=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
ncurses,
|
||||
nixos-option,
|
||||
stdenvNoCC,
|
||||
unixtools,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
@@ -94,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "home-manager";
|
||||
maintainers = with lib.maintainers; [ bryango ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
pname = "htpdate";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twekkel";
|
||||
repo = "htpdate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-dl3xlwk2q1DdGrIQsbKwdYDjyhGxpYwQGcd9k91LkxA=";
|
||||
sha256 = "sha256-aDir0e/itYxo0wgKIyT2chEVyXgz6nd2JOuyo7Yq/js=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/fileops.c b/fileops.c
|
||||
index 1e70af1..9017bd0 100644
|
||||
--- a/fileops.c
|
||||
+++ b/fileops.c
|
||||
@@ -68,7 +68,6 @@ FILE *ftemp(char *templ, const char *mode)
|
||||
#else
|
||||
int fd = mkstemp(templ);
|
||||
if(fd >= 0) {
|
||||
- FILE* fdopen(); /* in case -ansi is used */
|
||||
if(f = fdopen(fd, mode)) return f;
|
||||
close(fd);
|
||||
#endif
|
||||
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/squell/id3/pull/35
|
||||
./fix-gcc15.patch
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
@@ -33,8 +33,8 @@ buildGoModule rec {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
hash = "sha256-ELIbM+tWOGntv8XmNvRZ/Q2iSRq0g9Kv5LnkwLPisPM=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-8iKug4zsX3u0vS68osKRW6iOP+A3OdjI3yxNPIJaQqM=";
|
||||
fetcherVersion = 3;
|
||||
};
|
||||
|
||||
# Frontend is in a subdirectory
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inputplumber";
|
||||
version = "0.76.1";
|
||||
version = "0.77.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SkW79i1jutVwty18bWXJEUijDunHukF3Sxqm0VwzMz0=";
|
||||
hash = "sha256-sSLazAjwkTu4Vns8Vs4Gx47WG8fYQYJX6zhk0p139q0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nHAdU/7JHPveOvUsXqdmUQtzET2Jv6T6PN83S7TwsIM=";
|
||||
cargoHash = "sha256-OEpv09DipaGtmlUWmvl4+Hm3DyBvSRkZaGePDy14/OU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -3,37 +3,34 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
bison,
|
||||
flex,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "intercal";
|
||||
version = "0.31";
|
||||
version = "0.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://catb.org/esr/intercal/intercal-${version}.tar.gz";
|
||||
sha256 = "1z2gpa5rbqb7jscqlf258k0b0jc7d2zkyipb5csjpj6d3sw45n4k";
|
||||
hash = "sha256-fvYUjDUd9mhGbi3L15UXci+RwzyqORWVcTfzgzcfjVU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull patch pending upstream inclusion for -fno-common toolchains:
|
||||
# https://gitlab.com/esr/intercal/-/issues/4
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lang/c-intercal/files/c-intercal-31.0-no-common.patch?id=a110a98b4de6f280d770ba3cc92a4612326205a3";
|
||||
sha256 = "03523fc40042r2ryq5val27prlim8pld4950qqpawpism4w3y1p2";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
# Workaround: https://gitlab.com/esr/intercal/-/work_items/9
|
||||
substituteInPlace src/abcessh.in --replace-fail "#ifdef HAVE_STDARG_H" "#if 1"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
bison
|
||||
flex
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Intercal invokes gcc, so we need an explicit PATH
|
||||
|
||||
@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-DxTZaq2SlEmy9k7iAdjctpPkk+2rIaF+xEcfXj/ERWw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm config.h.in
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Islamic command-line tools for prayer times and hijri dates";
|
||||
longDescription = ''
|
||||
|
||||
@@ -4,20 +4,21 @@
|
||||
jre,
|
||||
makeWrapper,
|
||||
maven,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "j-mc-2-obj";
|
||||
version = "126";
|
||||
version = "128";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmc2obj";
|
||||
repo = "j-mc-2-obj";
|
||||
rev = version;
|
||||
hash = "sha256-c0qLryv9Gx9BlKXmwSKkK5/v3Wypny841htNfsNNxpg=";
|
||||
tag = version;
|
||||
hash = "sha256-3+vH1pGJ6I4oobb2vk+J5GrOQrSLNoCuBIC9OsWYCj0=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-ya8E/6tOxyW+AO7v9p0dg72qFpQjWwvntZOw+TEKq0k=";
|
||||
mvnHash = "sha256-ZU/5RGujCdmlBuxtHDaBpF/54e8W/Kca+2jtTudMXWo=";
|
||||
|
||||
mvnParameters = "-Dmaven.gitcommitid.skip=true";
|
||||
|
||||
@@ -33,6 +34,8 @@ maven.buildMavenPackage rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/jmc2obj/j-mc-2-obj/releases/tag/${version}";
|
||||
description = "Java-based Minecraft-to-OBJ exporter";
|
||||
|
||||
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
|
||||
OPTFLAGS="-O -Wno-error=incompatible-pointer-types" \
|
||||
JTMPDIR=$TMPDIR
|
||||
TERMCAPLIB=-lncurses \
|
||||
SHELL=${runtimeShell} \
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jujutsu";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jj-vcs";
|
||||
repo = "jj";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PBrsNHywOUEiFyyHW6J4WHDmLwVWv2JkbHCNvbE0tHE=";
|
||||
hash = "sha256-id35e2kzyHyXCRy0aomkd1l0K7qzD0RnzdAzxKUGiso=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jOklgYw6mYCs/FnTczmkT7MlepNtnHXfFB4lghpLOVE=";
|
||||
cargoHash = "sha256-zWfdIac+SsNdfXAfD4NVTl7YfXzAlrK82KNduFgG1EA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.28.0";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = "k0sctl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gPGMOawC8SymiGp0Zcm/bk+sD8R4DWDCrJpi4LGcDnE=";
|
||||
hash = "sha256-D47BSI0BcVyO8y42+aqkp1/59548kENtqdQyXg519os=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ixL1S60XOtqzadQTZsT5utfsSW2LE9/30xXujQvgpxI=";
|
||||
vendorHash = "sha256-zUKfn7dli/vfHha3AaFrSbux1oDOZyV2dWE/BorYN8I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
installFonts,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
@@ -14,15 +15,15 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-JQZ3ySnTd1owkTZDWUN5ryZKwu8oAQNaody+MLm+I6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zstd ];
|
||||
outputs = [
|
||||
"out"
|
||||
"webfont"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
installFonts
|
||||
zstd
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Libertinus font family";
|
||||
|
||||
@@ -68,6 +68,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glade
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
librsvg
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
xvfb-run
|
||||
at-spi2-atk
|
||||
@@ -76,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
"-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}"
|
||||
|
||||
@@ -38,8 +38,10 @@ stdenv.mkDerivation {
|
||||
local indexJs="$out/Applications/LM Studio.app/Contents/Resources/app/.webpack/main/index.js"
|
||||
substituteInPlace "$indexJs" --replace-quiet "'/Applications'" "'/'"
|
||||
|
||||
# Re-sign the app bundle after patching, otherwise macOS reports it as damaged
|
||||
codesign --force --deep --sign - "$out/Applications/LM Studio.app"
|
||||
# Re-sign the main executable, otherwise macOS reports the app as damaged
|
||||
appBundle="$out/Applications/LM Studio.app"
|
||||
mainExe="$appBundle/Contents/MacOS/LM Studio"
|
||||
codesign --force --sign - "$mainExe"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
qt6,
|
||||
gitUpdater,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
@@ -64,7 +65,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
pythonImportsCheck = [ "maestral_qt" ];
|
||||
|
||||
passthru.tests.maestral = nixosTests.maestral;
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
ignoredVersions = "dev";
|
||||
rev-prefix = "v";
|
||||
};
|
||||
tests.maestral = nixosTests.maestral;
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "marp-cli";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marp-team";
|
||||
repo = "marp-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dj3DkHgoez4S2TtQQ9KlOWUFZkKDy5lUoNUhPkgUu64=";
|
||||
hash = "sha256-DWXJ049pgrUFpacKObKURU8YrIl6Q4O4bXkzU35Dq00=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-tPFc7b5OtjRJiD8yGLOYiAMQ7NroJvGlpIvRlrq2TxQ=";
|
||||
npmDepsHash = "sha256-rIL5x6VLfT+mGqjE3yHQs1Dp0SZt7ZlhmC3dzSJXGRM=";
|
||||
npmPackFlags = [ "--ignore-scripts" ];
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -11,12 +11,12 @@ telegram-desktop.override {
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
pname = "materialgram-unwrapped";
|
||||
version = "6.4.0.1";
|
||||
version = "6.7.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kukuruzka165";
|
||||
repo = "materialgram";
|
||||
hash = "sha256-aNgvuuowyhEYUm5ie2vxCsdpaDuuZ/3xZJqWA0bN5Lc=";
|
||||
hash = "sha256-Cy0ooQZOhfE+QBaRDblKXhmqYsKJ0TfeHsfJaVLVn8o=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.152.0";
|
||||
version = "1.152.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cjc9vC3sfsFaxcxEpXAAAza9/p3fk/2oCa4oB1fWAdA=";
|
||||
hash = "sha256-81nqT6/TuqtQjjqnT6O+72WCCPlZ9JJKbWczMh6mbcU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-OJhlpKwRCE7IqstwIzj1dBJMbMyPVA/w3RVnYfjz764=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-aYBd1+QkME+q2LkZRnlxHEbIQz38k+N64YSS+NOu0QU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,18 +3,15 @@
|
||||
fetchFromGitHub,
|
||||
buildDartApplication,
|
||||
}:
|
||||
let
|
||||
version = "7.3.0";
|
||||
buildDartApplication (finalAttrs: {
|
||||
pname = "melos";
|
||||
version = "7.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "invertase";
|
||||
repo = "melos";
|
||||
tag = "melos-v${version}";
|
||||
hash = "sha256-XTEhH8F54BoXJ1QNhUIZszHQoDwP0Za1LPQ6Dv9sR08=";
|
||||
tag = "melos-v${finalAttrs.version}";
|
||||
hash = "sha256-bsNPZd1euOKF2LlAmBIkr+0iO51iAkcIZYrd5oUJTKo=";
|
||||
};
|
||||
in
|
||||
buildDartApplication {
|
||||
pname = "melos";
|
||||
inherit version src;
|
||||
|
||||
patches = [
|
||||
# Patch melos entrypoint to bypass cli_launcher which throws because it does not find melos in the "classic" folders eg : .dart_tool or pub cache.
|
||||
@@ -34,6 +31,16 @@ buildDartApplication {
|
||||
cp --recursive packages/melos/templates $out/
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = {
|
||||
command = [
|
||||
./update.sh
|
||||
./.
|
||||
];
|
||||
supportedFeatures = [ "commit" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/invertase/melos";
|
||||
description = "Tool for managing Dart projects with multiple packages";
|
||||
@@ -41,4 +48,4 @@ buildDartApplication {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.eymeric ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
|
||||
"sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "91.0.0"
|
||||
"version": "96.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||
"sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.4.1"
|
||||
"version": "10.2.0"
|
||||
},
|
||||
"ansi_styles": {
|
||||
"dependency": "transitive",
|
||||
@@ -64,11 +64,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9",
|
||||
"sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.2"
|
||||
"version": "4.0.4"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -84,11 +84,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
|
||||
"sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.12.0"
|
||||
"version": "8.12.4"
|
||||
},
|
||||
"charcode": {
|
||||
"dependency": "transitive",
|
||||
@@ -124,11 +124,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "cli_launcher",
|
||||
"sha256": "17d2744fb9a254c49ec8eda582536abe714ea0131533e24389843a4256f82eac",
|
||||
"sha256": "35cf15a3ffaeb9c11849eaa0afba761bb76dceb42d050532bfd3e1299c9748cd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.3.2+1"
|
||||
"version": "0.3.3+1"
|
||||
},
|
||||
"cli_util": {
|
||||
"dependency": "transitive",
|
||||
@@ -144,11 +144,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "code_builder",
|
||||
"sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
|
||||
"sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.11.0"
|
||||
"version": "4.11.1"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -194,11 +194,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
|
||||
"sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.2"
|
||||
"version": "3.1.7"
|
||||
},
|
||||
"file": {
|
||||
"dependency": "transitive",
|
||||
@@ -254,11 +254,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http",
|
||||
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
|
||||
"sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
@@ -290,25 +290,15 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.5"
|
||||
},
|
||||
"js": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "js",
|
||||
"sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.2"
|
||||
},
|
||||
"json_annotation": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "json_annotation",
|
||||
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
|
||||
"sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.9.0"
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"logging": {
|
||||
"dependency": "transitive",
|
||||
@@ -324,21 +314,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
|
||||
"sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.17"
|
||||
"version": "0.12.19"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
|
||||
"sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.17.0"
|
||||
"version": "1.18.2"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -354,21 +344,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "mockito",
|
||||
"sha256": "4feb43bc4eb6c03e832f5fcd637d1abb44b98f9cfa245c58e27382f58859f8f6",
|
||||
"sha256": "a45d1aa065b796922db7b9e7e7e45f921aed17adf3a8318a1f47097e7e695566",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.1"
|
||||
"version": "5.6.3"
|
||||
},
|
||||
"mustache_template": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "mustache_template",
|
||||
"sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de",
|
||||
"sha256": "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.2"
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"node_preamble": {
|
||||
"dependency": "transitive",
|
||||
@@ -404,11 +394,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "petitparser",
|
||||
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
|
||||
"sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.1"
|
||||
"version": "7.0.2"
|
||||
},
|
||||
"platform": {
|
||||
"dependency": "transitive",
|
||||
@@ -524,11 +514,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_gen",
|
||||
"sha256": "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243",
|
||||
"sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.2"
|
||||
"version": "4.2.1"
|
||||
},
|
||||
"source_map_stack_trace": {
|
||||
"dependency": "transitive",
|
||||
@@ -554,11 +544,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_span",
|
||||
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
|
||||
"sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.10.1"
|
||||
"version": "1.10.2"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
@@ -604,31 +594,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
|
||||
"sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.26.3"
|
||||
"version": "1.30.0"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
|
||||
"sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.7"
|
||||
"version": "0.7.10"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
|
||||
"sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.12"
|
||||
"version": "0.6.16"
|
||||
},
|
||||
"typed_data": {
|
||||
"dependency": "transitive",
|
||||
@@ -654,11 +644,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "watcher",
|
||||
"sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
|
||||
"sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.4"
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"web": {
|
||||
"dependency": "transitive",
|
||||
@@ -724,14 +714,14 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "yaml_edit",
|
||||
"sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
|
||||
"sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.2"
|
||||
"version": "2.2.4"
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.9.0 <4.0.0"
|
||||
"dart": ">=3.10.0 <4.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
Executable
+92
@@ -0,0 +1,92 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq dart yq-go nix
|
||||
|
||||
set -e
|
||||
|
||||
# Get the directory where this script is located
|
||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
# Fetch the latest tags from GitHub
|
||||
echo "Fetching latest tags from GitHub..." >&2
|
||||
tags=$(curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/invertase/melos/tags?per_page=20")
|
||||
|
||||
if [ -z "$tags" ]; then
|
||||
echo "Error: Failed to fetch tags from GitHub" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract the latest stable version tag (skip dev versions)
|
||||
latest_release=$(echo "$tags" | jq -r '.[] | select(.name | test("^melos-v[0-9]+\\.[0-9]+\\.[0-9]+$")) | .name' | head -1)
|
||||
|
||||
if [ -z "$latest_release" ]; then
|
||||
echo "Error: Could not find any stable release tags" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
new_version=${latest_release#melos-v}
|
||||
|
||||
# Get current version from package.nix
|
||||
current_version=$(grep 'version = ' "$script_dir/package.nix" | head -1 | sed 's/.*version = "\(.*\)".*/\1/')
|
||||
|
||||
echo "Current version: $current_version" >&2
|
||||
echo "Latest version: $new_version" >&2
|
||||
|
||||
if [ "$new_version" = "$current_version" ]; then
|
||||
echo "Already at latest version" >&2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Create a temporary directory
|
||||
tmpdir=$(mktemp -d)
|
||||
trap "rm -rf $tmpdir" EXIT
|
||||
|
||||
echo "Downloading melos ${latest_release} from GitHub..." >&2
|
||||
archive_url="https://github.com/invertase/melos/archive/refs/tags/${latest_release}.tar.gz"
|
||||
archive_path="$tmpdir/melos.tar.gz"
|
||||
|
||||
if ! curl -sL -o "$archive_path" "$archive_url"; then
|
||||
echo "Error: Failed to download archive" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Extracting archive..." >&2
|
||||
tar -xzf "$archive_path" -C "$tmpdir"
|
||||
|
||||
extracted_dir=$(tar -tzf "$archive_path" | head -1 | cut -d/ -f1)
|
||||
source_dir="$tmpdir/$extracted_dir"
|
||||
|
||||
echo "Generating pubspec.lock..." >&2
|
||||
cd "$source_dir"
|
||||
dart pub get > /dev/null 2>&1
|
||||
|
||||
echo "Converting to JSON..." >&2
|
||||
yq eval --output-format=json --prettyPrint pubspec.lock > "$tmpdir/pubspec.lock.json"
|
||||
|
||||
# Compute the hash from the downloaded archive
|
||||
echo "Computing source hash..." >&2
|
||||
nix_hash=$(nix-hash --flat --base32 --type sha256 "$archive_path")
|
||||
if [ -z "$nix_hash" ]; then
|
||||
echo "Error: Failed to compute source hash" >&2
|
||||
exit 1
|
||||
fi
|
||||
new_hash="sha256-$(nix-hash --to-sri --type sha256 "$nix_hash")"
|
||||
|
||||
cp "$tmpdir/pubspec.lock.json" "$script_dir/pubspec.lock.json"
|
||||
echo "Updated pubspec.lock.json" >&2
|
||||
|
||||
# Update version in package.nix
|
||||
sed -i "s/version = \"[^\"]*\";/version = \"${new_version}\";/" "$script_dir/package.nix"
|
||||
echo "Updated version to ${new_version}" >&2
|
||||
|
||||
# Update hash in package.nix
|
||||
sed -i "s|hash = \"[^\"]*\";|hash = \"${new_hash}\";|" "$script_dir/package.nix"
|
||||
echo "Updated hash" >&2
|
||||
|
||||
# Output commit message
|
||||
printf '{
|
||||
"attrPath": "melos",
|
||||
"oldVersion": "%s",
|
||||
"newVersion": "%s",
|
||||
"files": ["pubspec.lock.json", "package.nix"],
|
||||
"commitMessage": "melos: %s -> %s"
|
||||
}' "$current_version" "$new_version" "$current_version" "$new_version"
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mergiraf";
|
||||
version = "0.16.3";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "mergiraf";
|
||||
repo = "mergiraf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KlielG8XxOlS5Np8LZT+GMujWw/7EDOwsZHWVjneV3g=";
|
||||
hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F6YtOgcAR4fN33j7Ae4ixhTfNctUfgkV3t1I7XJzHHw=";
|
||||
cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
|
||||
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
pnpmWorkspaces
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-p8AdAYqaHoKaWirNy9uPLs/kRDVNDcXBJQ1y29MVAA0=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-yUdPrZAnCsxIiF++SxTm1VuVAEKIzTsp2qd/WcCPOcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user