Merge 3ed93ea844 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-08-07 00:24:16 +00:00
committed by GitHub
234 changed files with 4085 additions and 4932 deletions

View File

@@ -5,7 +5,9 @@
"ghcr.io/devcontainers/features/nix:1": {
// fails in the devcontainer sandbox, enable sandbox via config instead
"multiUser": false,
"packages": "nixpkgs.nixd,nixpkgs.nixfmt",
// TODO: nixfmt-rfc-style → nixfmt (once it's in a stable release)
// https://github.com/NixOS/nixpkgs/issues/425583
"packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style",
"useAttributePath": true,
"extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
}

View File

@@ -32,12 +32,11 @@ jobs:
outputs:
targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
steps:
- name: Enable swap
# We'd rather fail than run slow eval on swap.
# Failing allows us to adjust the chunkSize to remain fast.
- name: Disable swap
run: |
sudo fallocate -l 10G /swap
sudo chmod 600 /swap
sudo mkswap /swap
sudo swapon /swap
sudo swapoff -a
- name: Check out the PR at the test merge commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -56,7 +55,7 @@ jobs:
run: |
nix-build untrusted/ci -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 10000 \
--arg chunkSize 8000 \
--out-link merged
# If it uses too much memory, slightly decrease chunkSize

View File

@@ -2,7 +2,7 @@
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg" width="500px" alt="NixOS logo">
</picture>
</a>

View File

@@ -73,12 +73,11 @@ let
;
# Attrs
# - keys: "added", "changed" and "removed"
# - keys: "added", "changed", "removed" and "rebuilds"
# - values: lists of `packagePlatformPath`s
diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
rebuilds = diffAttrs.added ++ diffAttrs.changed;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
changed-paths =
let
@@ -90,7 +89,7 @@ let
in
writeText "changed-paths.json" (
builtins.toJSON {
attrdiff = lib.mapAttrs (_: extractPackageNames) diffAttrs;
attrdiff = lib.mapAttrs (_: extractPackageNames) { inherit (diffAttrs) added changed removed; };
inherit
rebuildsByPlatform
rebuildsByKernel

View File

@@ -218,7 +218,8 @@ let
reduce .[] as $item ({}; {
added: (.added + $item.added),
changed: (.changed + $item.changed),
removed: (.removed + $item.removed)
removed: (.removed + $item.removed),
rebuilds: (.rebuilds + $item.rebuilds)
})
' > $out/combined-diff.json

View File

@@ -18,13 +18,20 @@ let
added: [ <keys only in the second object> ],
removed: [ <keys only in the first object> ],
changed: [ <keys with different values between the two objects> ],
rebuilds: [ <keys in the second object with values not present at all in first object> ],
}
*/
diff =
old: new:
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
oldOutputs = lib.pipe old [
(lib.mapAttrsToList (_: lib.attrValues))
lib.concatLists
(lib.flip lib.genAttrs (_: true))
];
in
old: new: {
{
added = filterKeys (n: _: !(old ? ${n})) new;
removed = filterKeys (n: _: !(new ? ${n})) old;
changed = filterKeys (
@@ -35,6 +42,16 @@ let
# Filter out attributes that are the same as the new value
&& (v != (new.${n}))
) old;
# A "rebuild" is every attrpath ...
rebuilds = filterKeys (
_: pkg:
# ... that has at least one output ...
lib.any (
output:
# ... which has not been built in "old" already.
!(oldOutputs ? ${output})
) (lib.attrValues pkg)
) new;
};
getAttrs =

View File

@@ -37,6 +37,8 @@
- `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x).
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
- The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.
- `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/)

View File

@@ -24467,6 +24467,9 @@
{
fingerprint = "B520 0ABF BD21 3FC9 C17C 6DB9 1291 CBBC F3B9 F225";
}
{
fingerprint = "7783 298E CC2A 778E AC7E F1C8 C430 A3B6 C376 10D1";
}
];
};
swendel = {

View File

@@ -140,8 +140,8 @@ in
pkgs.runCommand ukiFile
{
nativeBuildInputs = [
pkgs.jq
pkgs.systemdUkify
pkgs.buildPackages.jq
pkgs.buildPackages.systemdUkify
];
}
''
@@ -177,9 +177,9 @@ in
};
nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [
pkgs.systemdUkify
pkgs.buildPackages.systemdUkify
verityHashCheck
pkgs.jq
pkgs.buildPackages.jq
];
preBuild = ''

View File

@@ -21,14 +21,14 @@ in
options.services.greetd = {
enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon";
package = lib.mkPackageOption pkgs [ "greetd" "greetd" ] { };
package = lib.mkPackageOption pkgs "greetd" { };
settings = lib.mkOption {
type = settingsFormat.type;
example = lib.literalExpression ''
{
default_session = {
command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway";
command = "''${pkgs.greetd}/bin/agreety --cmd sway";
};
}
'';

View File

@@ -172,6 +172,11 @@ in
assertion = cfg.settings.dynamic_tuning -> cfg.settings.daemon;
message = "`services.tuned.settings.dynamic_tuning` requires `services.tuned.settings.daemon` to be `true`.";
}
{
assertion = cfg.ppdSupport -> config.services.upower.enable;
message = "`services.tuned.ppdSupport` requires `services.upower` to be enabled.";
}
]
# Declare service conflicts, also sourced from `tuned.service`
++
@@ -218,6 +223,11 @@ in
# Many DEs (like GNOME and KDE Plasma) enable PPD by default
# Let's try to make it easier to transition by only enabling this module
power-profiles-daemon.enable = false;
# NOTE: Required by `tuned-ppd` for handling power supply changes
# (i.e., `services.tuned.ppdSettings.main.battery_detection`)
# https://github.com/NixOS/nixpkgs/issues/431105
upower.enable = lib.mkIf cfg.ppdSupport true;
};
systemd = {

View File

@@ -60,7 +60,7 @@ let
# We only include the out output here to avoid needing to include all
# other outputs in the installer tests as well
# We only need the udevadm command anyway
pkgs.systemdMinimal.out
pkgs.buildPackages.systemdMinimal.out
];
}
''

View File

@@ -89,10 +89,10 @@ in
after = [ "network.target" ];
environment = {
STATIC_DIR = ".";
DATA_DIR = ".";
HF_HOME = ".";
SENTENCE_TRANSFORMERS_HOME = ".";
STATIC_DIR = "${cfg.stateDir}/static";
DATA_DIR = "${cfg.stateDir}/data";
HF_HOME = "${cfg.stateDir}/hf_home";
SENTENCE_TRANSFORMERS_HOME = "${cfg.stateDir}/transformers_home";
WEBUI_URL = "http://localhost:${toString cfg.port}";
}
// cfg.environment;

View File

@@ -184,6 +184,10 @@ let
(boolOpt "enabled" cfg.ntcp2.enable)
(boolOpt "published" cfg.ntcp2.published)
(intOpt "port" cfg.ntcp2.port)
(sec "ssu2")
(boolOpt "enabled" cfg.ssu2.enable)
(boolOpt "published" cfg.ssu2.published)
(intOpt "port" cfg.ssu2.port)
(sec "addressbook")
(strOpt "defaulturl" cfg.addressbook.defaulturl)
]
@@ -540,6 +544,18 @@ in
'';
};
ssu2 = {
enable = mkEnableTrueOption "SSU2";
published = mkEnableOption "SSU2 publication";
port = mkOption {
type = types.port;
default = 0;
description = ''
Port to listen for incoming SSU2 connections (0=auto).
'';
};
};
limits.transittunnels = mkOption {
type = types.int;
default = 2500;

View File

@@ -671,6 +671,8 @@ in
};
config = mkIf (cfg.enableClient || cfg.enableServer || cfg.enablePam) {
warnings = lib.optionals (cfg.package.eolMessage != "") [ cfg.package.eolMessage ];
assertions =
let
entityList =

View File

@@ -772,8 +772,18 @@ in
k3s = handleTest ./k3s { };
kafka = handleTest ./kafka { };
kanboard = runTest ./web-apps/kanboard.nix;
kanidm = runTest ./kanidm.nix;
kanidm-provisioning = runTest ./kanidm-provisioning.nix;
kanidm =
kanidmVersion:
runTest {
imports = [ ./kanidm.nix ];
_module.args = { inherit kanidmVersion; };
};
kanidm-provisioning =
kanidmVersion:
runTest {
imports = [ ./kanidm-provisioning.nix ];
_module.args = { inherit kanidmVersion; };
};
karma = runTest ./karma.nix;
kavita = runTest ./kavita.nix;
kbd-setfont-decompress = runTest ./kbd-setfont-decompress.nix;

View File

@@ -27,7 +27,7 @@
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.greetd}/bin/agreety --cmd bash";
command = "${pkgs.greetd}/bin/agreety --cmd bash";
};
};
};

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ kanidmVersion, pkgs, ... }:
let
certs = import ./common/acme/server/snakeoil-certs.nix;
serverDomain = certs.domain;
@@ -13,6 +13,8 @@ let
provisionAdminPassword = "very-strong-password-for-admin";
provisionIdmAdminPassword = "very-strong-password-for-idm-admin";
provisionIdmAdminPassword2 = "very-strong-alternative-password-for-idm-admin";
kanidmPackage = pkgs."kanidmWithSecretProvisioning_${kanidmVersion}";
in
{
name = "kanidm-provisioning";
@@ -22,7 +24,7 @@ in
{ pkgs, lib, ... }:
{
services.kanidm = {
package = pkgs.kanidmWithSecretProvisioning_1_6;
package = kanidmPackage;
enableServer = true;
serverSettings = {
origin = "https://${serverDomain}";
@@ -273,11 +275,11 @@ in
users.users.kanidm.shell = pkgs.bashInteractive;
environment.systemPackages = with pkgs; [
kanidm
openldap
ripgrep
jq
environment.systemPackages = [
kanidmPackage
pkgs.openldap
pkgs.ripgrep
pkgs.jq
];
};

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ kanidmVersion, pkgs, ... }:
let
certs = import ./common/acme/server/snakeoil-certs.nix;
serverDomain = certs.domain;
@@ -13,6 +13,8 @@ let
cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
cp ${certs."${serverDomain}".key} $out/snakeoil.key
'';
kanidmPackage = pkgs."kanidm_${kanidmVersion}";
in
{
name = "kanidm";
@@ -25,7 +27,7 @@ in
{ pkgs, ... }:
{
services.kanidm = {
package = pkgs.kanidm_1_6;
package = kanidmPackage;
enableServer = true;
serverSettings = {
origin = "https://${serverDomain}";
@@ -44,10 +46,10 @@ in
users.users.kanidm.shell = pkgs.bashInteractive;
environment.systemPackages = with pkgs; [
kanidm
openldap
ripgrep
environment.systemPackages = [
kanidmPackage
pkgs.openldap
pkgs.ripgrep
];
};
@@ -55,7 +57,7 @@ in
{ nodes, ... }:
{
services.kanidm = {
package = pkgs.kanidm_1_6;
package = kanidmPackage;
enableClient = true;
clientSettings = {
uri = "https://${serverDomain}";

View File

@@ -31,7 +31,6 @@
services.xserver.windowManager.qtile = {
enable = true;
configFile = "${config-deriv}/config.py";
extraPackages = ps: [ ps.qtile-extras ];
};
services.displayManager.defaultSession = lib.mkForce "qtile";

View File

@@ -11,18 +11,18 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2025.1.4",
"sha256": "8d90be9d11c0f47b380f4a9f705058215817edf043bdcea2223d788d25193f78",
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.4.tar.gz",
"build_number": "251.27812.15"
"version": "2025.2",
"sha256": "a12d094544f0b5222d34e2cd8b36b1ea834e7c7acdea7b65aae5cb3522ca108e",
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.tar.gz",
"build_number": "252.23892.426"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
"version": "2025.2",
"sha256": "5c44d4cb3e323f6913ef09a50b13028f92a7db6809b08a26763929555186df31",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.tar.gz",
"build_number": "252.23892.363"
"version": "2025.2.1",
"sha256": "1a0dea8a82920818e40b552950e90caf39bcf6ca9ae4e973a1d49e7db0498ecc",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1.tar.gz",
"build_number": "252.23892.464"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
@@ -43,10 +43,10 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2025.1.4",
"sha256": "42efe9cc97248403e868180339f403ab390e9a335a658bd7aa905b64c03c7a31",
"url": "https://download.jetbrains.com/go/goland-2025.1.4.tar.gz",
"build_number": "251.27812.54"
"version": "2025.2",
"sha256": "d285c10055af9002db8c913557535ba46e3158c5733b236add3d71f93873e85a",
"url": "https://download.jetbrains.com/go/goland-2025.2.tar.gz",
"build_number": "252.23892.449"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@@ -75,10 +75,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2025.1.4.1",
"sha256": "92cd8d570d0307188190761c7cd0d0f77351ff119735073c2a101e4a364292b4",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1.tar.gz",
"build_number": "251.27812.52",
"version": "2025.2",
"sha256": "d0d3e61aaed7c4765b4947a8410a885cf7e1123c488340585ed72151f8c05350",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.tar.gz",
"build_number": "252.23892.419",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -116,10 +116,10 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
"version": "2025.1.5",
"sha256": "54eda433719c132c48e733b659b29113d362fea3b9c7dd4109497ed31da7c6f6",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5.tar.gz",
"build_number": "251.26927.79"
"version": "2025.2",
"sha256": "98bf8781c9325d3c4ddd6b0f4efb934b209f2afcbf97533effd2e8ffe40800e0",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.tar.gz",
"build_number": "252.23892.452"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
@@ -150,18 +150,18 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
"version": "2025.1.4",
"sha256": "0864c25fe8bb442b3891e51382de177ff5543bf075bbd1c12767984695f2dcaa",
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.4-aarch64.tar.gz",
"build_number": "251.27812.15"
"version": "2025.2",
"sha256": "a594949bd15a70dd17906d056778b8107a209e0bc874a188b411da8e8f7e4f16",
"url": "https://download.jetbrains.com/cpp/CLion-2025.2-aarch64.tar.gz",
"build_number": "252.23892.426"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
"version": "2025.2",
"sha256": "fb358605d813007eea7e010cf642a822f04eea60d5808865d153429b4d5784dd",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2-aarch64.tar.gz",
"build_number": "252.23892.363"
"version": "2025.2.1",
"sha256": "da21f165bce024ed6e99275350da41fa49e8ac51a47da50ed7a1e104edc06aa0",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1-aarch64.tar.gz",
"build_number": "252.23892.464"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
@@ -182,10 +182,10 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
"version": "2025.1.4",
"sha256": "4c24dddd6babfc36d70b0287bf32857d2c01c61d3ef1d2579a29f741c71fdad0",
"url": "https://download.jetbrains.com/go/goland-2025.1.4-aarch64.tar.gz",
"build_number": "251.27812.54"
"version": "2025.2",
"sha256": "99a5f3e0455fddf62ce92644cb53906e4600da6d2d2dad89164c594c31faa157",
"url": "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz",
"build_number": "252.23892.449"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@@ -214,10 +214,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
"version": "2025.1.4.1",
"sha256": "3e06d34ec4a49faa88492e1d6fda8fc53c8e2d01839e553024b6b4e38e2ab9cf",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1-aarch64.tar.gz",
"build_number": "251.27812.52",
"version": "2025.2",
"sha256": "06821ba75ce5dd5f192246befd5aedfc236606d8c4a1a2c15bf3d21a39c6cf04",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.2-aarch64.tar.gz",
"build_number": "252.23892.419",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -255,10 +255,10 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
"version": "2025.1.5",
"sha256": "9c53be6d814983852e39081db69a0ec337fd7dad77f4278fbbfd246d43f7d3e4",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5-aarch64.tar.gz",
"build_number": "251.26927.79"
"version": "2025.2",
"sha256": "aeb1876b94904056994b8735c4e9b35b2579daea843347ae04eaf9634bb71370",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2-aarch64.tar.gz",
"build_number": "252.23892.452"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
@@ -289,18 +289,18 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2025.1.4",
"sha256": "73076ec3803acaf61feb0181d60a0a4a13ff33b09997995f4a57b9dc37a175ac",
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.4.dmg",
"build_number": "251.27812.15"
"version": "2025.2",
"sha256": "7fb1e9149b29e9794af5975715f14c65b856358ea64161eddb81a80e576158cf",
"url": "https://download.jetbrains.com/cpp/CLion-2025.2.dmg",
"build_number": "252.23892.426"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
"version": "2025.2",
"sha256": "241a87b39b88b1e6e03ee3296f7839807ae926cc5bef9d1783bbab17d5951299",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.dmg",
"build_number": "252.23892.363"
"version": "2025.2.1",
"sha256": "e6c7fd2777ec7f621fa08b6d2d599c84b765d94be9d2b7a62f840ea6253cb9fe",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1.dmg",
"build_number": "252.23892.464"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
@@ -321,10 +321,10 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2025.1.4",
"sha256": "4b9ec3bf0cf040dd076b028f68f91815664cfdd11f51c68c54a60cbf1df3af25",
"url": "https://download.jetbrains.com/go/goland-2025.1.4.dmg",
"build_number": "251.27812.54"
"version": "2025.2",
"sha256": "c42e150a88b9d9ef033a7ff3678eb891408668afe83179d4f678bb674dc8e424",
"url": "https://download.jetbrains.com/go/goland-2025.2.dmg",
"build_number": "252.23892.449"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@@ -353,10 +353,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2025.1.4.1",
"sha256": "ce91ad25859ce7081c2181468aa57fef76e4f394049cb90da5ab69f34d9d9209",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1.dmg",
"build_number": "251.27812.52",
"version": "2025.2",
"sha256": "2a28e39d10e6470c25839698a160eb0076fb5f8a1e0e3cb9000876d05ab0d502",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.dmg",
"build_number": "252.23892.419",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -394,10 +394,10 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
"version": "2025.1.5",
"sha256": "320183fdab31207bf56396e97ba4c15549feec71885f5f390a70a1c1cd81ecc7",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5.dmg",
"build_number": "251.26927.79"
"version": "2025.2",
"sha256": "c0f19ea5e9c7cb27f80312d0eb8c7f7c3b294a0bf583b0a423930827f3cd73c5",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.dmg",
"build_number": "252.23892.452"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
@@ -428,18 +428,18 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2025.1.4",
"sha256": "85e0f764787a3d910d92f3f61ea4b6b3ff46712c674154adbccafc45640e1ff2",
"url": "https://download.jetbrains.com/cpp/CLion-2025.1.4-aarch64.dmg",
"build_number": "251.27812.15"
"version": "2025.2",
"sha256": "40be28243da1bdb90308e997656af5872103a32d167e1539dd4e1b00a7ce0ea4",
"url": "https://download.jetbrains.com/cpp/CLion-2025.2-aarch64.dmg",
"build_number": "252.23892.426"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
"version": "2025.2",
"sha256": "86a4851e0ab9a74bb1c12c829752dc04b1e15b1ba668f7712ea6a0ecb5be058b",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2-aarch64.dmg",
"build_number": "252.23892.363"
"version": "2025.2.1",
"sha256": "865a887cc89076eac601bc073e74d6cb1b5711aaf8f4c39a2f7bd18648d9cc6e",
"url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.1-aarch64.dmg",
"build_number": "252.23892.464"
},
"dataspell": {
"update-channel": "DataSpell RELEASE",
@@ -460,10 +460,10 @@
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2025.1.4",
"sha256": "3a49552e2c3a0a08b1758f9ab7ad2b119ca3fd1b5067b2432ac438537f53d5c8",
"url": "https://download.jetbrains.com/go/goland-2025.1.4-aarch64.dmg",
"build_number": "251.27812.54"
"version": "2025.2",
"sha256": "043600466d739338b9d24a472547b3d7133505165032459e9fe6f913b6920eac",
"url": "https://download.jetbrains.com/go/goland-2025.2-aarch64.dmg",
"build_number": "252.23892.449"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
@@ -492,10 +492,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2025.1.4.1",
"sha256": "69dbad250e42863c3b3bf724734d4428ff148c73cab39f8faf946ae44f9437a3",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.4.1-aarch64.dmg",
"build_number": "251.27812.52",
"version": "2025.2",
"sha256": "d4ca651a534dfa72d6c6221c23a49bb4bf10a533013db71d51096bb380f1a9c0",
"url": "https://download.jetbrains.com/webide/PhpStorm-2025.2-aarch64.dmg",
"build_number": "252.23892.419",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -533,10 +533,10 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
"version": "2025.1.5",
"sha256": "9386f41063a209d4634098bc14e8e63d3cf030b3f8b83524b61d99bf992905d1",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.5-aarch64.dmg",
"build_number": "251.26927.79"
"version": "2025.2",
"sha256": "dd0681951c4a8f2a4b97480f37f29c688ff8c7572d96d2417c4bdac1988d17f6",
"url": "https://download.jetbrains.com/rustrover/RustRover-2025.2-aarch64.dmg",
"build_number": "252.23892.452"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",

File diff suppressed because it is too large Load Diff

View File

@@ -48,6 +48,7 @@ mapAliases (
solarized = vim-colors-solarized;
spacevim = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
sparkup = throw "the upstream repository got deleted"; # added 2025-08-06
colors-solarized = vim-colors-solarized;
caw = caw-vim;
chad = chadtree;

View File

@@ -3950,6 +3950,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
demicolon-nvim = buildVimPlugin {
pname = "demicolon.nvim";
version = "2025-04-25";
src = fetchFromGitHub {
owner = "mawkler";
repo = "demicolon.nvim";
rev = "8d79e527dbbef9de06405a30258b8d752c0638c4";
sha256 = "1mcn8pidpnh0fhyigzc4y4a349lgarry082y2nx39qzm2pvw0g2i";
};
meta.homepage = "https://github.com/mawkler/demicolon.nvim/";
meta.hydraPlatforms = [ ];
};
denite-extra = buildVimPlugin {
pname = "denite-extra";
version = "2019-03-29";
@@ -13784,19 +13797,6 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
sparkup = buildVimPlugin {
pname = "sparkup";
version = "2012-06-11";
src = fetchFromGitHub {
owner = "chrisgeo";
repo = "sparkup";
rev = "6fbfceef890e705c47b42b27be743ffed6f9296e";
sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm";
};
meta.homepage = "https://github.com/chrisgeo/sparkup/";
meta.hydraPlatforms = [ ];
};
specs-nvim = buildVimPlugin {
pname = "specs.nvim";
version = "2025-01-18";

View File

@@ -12,12 +12,12 @@
pkgs,
}:
let
version = "0.0.27-unstable-2025-07-28";
version = "0.0.27-unstable-2025-08-06";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "5e4eb8652b4776f139282a343f04a3a8c7f23cb0";
hash = "sha256-rmpBI2j7zwU5tIUjK7fMhfle5LVksk/kuCnwN9WQkic=";
rev = "2fc63d4128d2dc2fef0913c7480b4586959ebe4e";
hash = "sha256-hHa300Ldszsnp6AuYVJwOFc5FfuRTd3phyM6/qBUIQo=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";

View File

@@ -1006,6 +1006,13 @@ in
dependencies = [ self.nvim-yarp ];
};
demicolon-nvim = super.demicolon-nvim.overrideAttrs {
dependencies = with self; [
nvim-treesitter
nvim-treesitter-textobjects
];
};
denops-vim = super.denops-vim.overrideAttrs {
postPatch = ''
# Use Nix's Deno instead of an arbitrary install

View File

@@ -302,6 +302,7 @@ https://github.com/kristijanhusak/defx-git/,,
https://github.com/kristijanhusak/defx-icons/,,
https://github.com/Shougo/defx.nvim/,,
https://github.com/Raimondi/delimitMate/,,
https://github.com/mawkler/demicolon.nvim/,HEAD,
https://github.com/neoclide/denite-extra/,,
https://github.com/neoclide/denite-git/,,
https://github.com/Shougo/denite.nvim/,,
@@ -1058,7 +1059,6 @@ https://github.com/sQVe/sort.nvim/,HEAD,
https://github.com/chikatoike/sourcemap.vim/,,
https://github.com/liuchengxu/space-vim/,,
https://github.com/FireIsGood/spaceman.nvim/,HEAD,
https://github.com/chrisgeo/sparkup/,,
https://github.com/cxwx/specs.nvim/,HEAD,
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
https://github.com/ravibrock/spellwarn.nvim/,HEAD,

View File

@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-uHUnCg8hkJQI0QSZZ5Kbj/S7ktY9ANdQqHCvBB+p1EA=";
hash = "sha256-fI+HzioLDxACH0anSkYOw47jpocVQp7m9xHh6APehis=";
};
nativeBuildInputs = [

View File

@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "material-icon-theme";
publisher = "PKief";
version = "5.24.0";
hash = "sha256-Skc+ib3gY2cLVepOjbBkpwPuUG9C29bh5BOxQOAZNtc=";
version = "5.25.0";
hash = "sha256-jkTFfyeFJ4ygsKJj41tWDJ91XitSs2onW4ni3rMNJE8=";
};
meta = {
description = "Material Design Icons for Visual Studio Code";

View File

@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2025-07-11";
version = "0-unstable-2025-08-01";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "48c58dbd18501fae92e641b6ee6ca5ca9de0d5c3";
hash = "sha256-AlvNh+tDY7FEqUm5zgm7072Z1zIXn54tvLGzLbTjLXo=";
rev = "40e400ab084175d3bd0f9e10cf8d6ac78c8b9544";
hash = "sha256-k/w1tmuGuRD98bR/kmc/9pLFGeobHMhKQapJOv8qVJo=";
fetchSubmodules = true;
};

View File

@@ -728,7 +728,8 @@ let
# Optional features:
use_gio = true;
use_cups = cupsSupport;
}
// lib.optionalAttrs (!chromiumVersionAtLeast "139") {
# Feature overrides:
# Native Client support was deprecated in 2020 and support will end in June 2021:
enable_nacl = false;

View File

@@ -114,7 +114,7 @@ chromium.get_deps(
},
**{
f"checkout_{arch}": True
for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc", "riscv64"]
},
},
"",

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,6 @@ clang_use_chrome_plugins=false
disable_fieldtrial_testing_config=true
enable_hangout_services_extension=false
enable_mdns=false
enable_nacl=false
enable_remoting=false
enable_reporting=false
enable_service_discovery=false

View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "141.0";
version = "141.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bd6998bce927c5b5c186537bd41475fc9e3809829ceadb2277bb382d02d3780d2a5e5749487567a75b7c9e3726f97662c4ec28924bc491c5a3f21e2ec4828d63";
sha512 = "6d1552bc64d915e784a5d560c8bb35a5308f35ebcd2552b027f80f950c7f0c627cca46b0796cf6e17d8f50c82e6f70a3ec11471ce0e058794f500b7b15e17b43";
};
meta = {

View File

@@ -1,11 +1,11 @@
{
"packageVersion": "141.0-1",
"packageVersion": "141.0.2-1",
"source": {
"rev": "141.0-1",
"hash": "sha256-sgs/96soNX6kHWzXSZW0Hkh5lBoMffRMhlOa3BJoY6I="
"rev": "141.0.2-1",
"hash": "sha256-M4RQcpIk4jjcSUFwMI5fPi7frMOEM4+FSpbqNiXxOVc="
},
"firefox": {
"version": "141.0",
"hash": "sha512-vWmYvOknxbXBhlN71BR1/J44CYKc6tsid7s4LQLTeA0qXldJSHVnp1t8njcm+XZixOwokkvEkcWj8h4uxIKNYw=="
"version": "141.0.2",
"hash": "sha512-bRVSvGTZFeeEpdVgyLs1pTCPNevNJVKwJ/gPlQx/DGJ8ykaweWz24X2PUMgub3Cj7BFHHODgWHlPUAt7FeF7Qw=="
}
}

View File

@@ -54,13 +54,13 @@
"vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
},
"alicloud": {
"hash": "sha256-OXLqn7D4Len8EYxwl/coKeh+bBAx4uVzfgiNFJ1Tcrg=",
"hash": "sha256-ITu569Um+3Y7FPCBNALvePAjCCIf/3+Hu0831o7rZCU=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.254.0",
"rev": "v1.256.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g="
"vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM="
},
"ansible": {
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
@@ -225,13 +225,13 @@
"vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA="
},
"buildkite": {
"hash": "sha256-XhO780RsMUx5J/GJ8xcFjN97b6XJ8eHuQjOQiuFUWHY=",
"hash": "sha256-pF46n0PJ2ru7s/1S6mznpJnlZx+3BQmPj5dlttjta+Q=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
"rev": "v1.22.1",
"rev": "v1.23.0",
"spdx": "MIT",
"vendorHash": "sha256-UgGfLh7kDOQK/EwuHQM0HoAaN95WyPWwypGPboPY9+s="
"vendorHash": "sha256-PuhOICFZJi6Fnu0cwrXc5YtJ3m5D1tC8C1wj6m9cfPY="
},
"ccloud": {
"hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
@@ -417,11 +417,11 @@
"vendorHash": "sha256-duHOqjy8AthXuDX63GO3myJ9TJmV0Ts1a8OsbSOGZWI="
},
"doppler": {
"hash": "sha256-2sgNPQvk0jylCEiZ0Cja54YbmqHSj+AgLANSLMVAqgw=",
"hash": "sha256-4BhccP7//s4GkKhwqsc8kyqWUUH/SuwsahbutAinyVw=",
"homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler",
"owner": "DopplerHQ",
"repo": "terraform-provider-doppler",
"rev": "v1.18.0",
"rev": "v1.20.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
},
@@ -525,11 +525,11 @@
"vendorHash": "sha256-eE9AY/79xQSbRl5kA0rwS8Oz8I9jaxT/KlVd0v0GAa8="
},
"google": {
"hash": "sha256-YwSl33ST8kvnVg5hr7PCSfEO0xRDRVvTEU3KEMfiIIg=",
"hash": "sha256-pDYqzdPUnCKpbQqe58o4CU605gdF8vovPR3fCAdf4zQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
"rev": "v6.45.0",
"rev": "v6.46.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
},
@@ -705,11 +705,11 @@
"vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="
},
"kafka": {
"hash": "sha256-Onyy+KgmgLYk3J1P4rhHDJ7uEb+9jbywkY7lbfdQ2Vs=",
"hash": "sha256-Z+WRuLumEjN6fGa91pKrFzc4I/5XwNFLh3rJ9Dob3x8=",
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
"owner": "Mongey",
"repo": "terraform-provider-kafka",
"rev": "v0.12.0",
"rev": "v0.12.1",
"spdx": "MIT",
"vendorHash": "sha256-kkaNv+c6IGAW+amSSycjBmUCFXBeQrcF5Jmvtl8bXAE="
},
@@ -840,11 +840,11 @@
"vendorHash": "sha256-oipY2hwgRrntCxxHPyH06e8p+0fKfAQwhh2iBI4RGHQ="
},
"minio": {
"hash": "sha256-hvttrw+7wqcCRyYdGhQvRvP1oDbAGmtR5UpcGx8LMgk=",
"hash": "sha256-TLWbbWYTjnvxT1LaV3FsL31xHHov8LpDYhA/nchMyMo=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
"rev": "v3.6.2",
"rev": "v3.6.3",
"spdx": "AGPL-3.0",
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
@@ -1021,11 +1021,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-L4ZqC11Uz7DhzAxcGfCfOEf3s9Fg+YFVa3Imy9GuYBU=",
"hash": "sha256-Aw7z5qq5xEOUkjDgKCh3S7DBpAZSk8ayaic+Ts9DaDs=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v3.27.2",
"rev": "v3.27.3",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1129,11 +1129,11 @@
"vendorHash": "sha256-xo0alLK3fccbKRG5bN1G7orDsP47I3ySAzpZ9O0f2Fg="
},
"rootly": {
"hash": "sha256-Lpysy/BQHYEWhTNcLvBY6C6o1G/PhKzxPe4qUHhPWmM=",
"hash": "sha256-1Sfxg72KHhpWg0NgkYeJ1oQ/MVOi0PL3nWd1KL3jNig=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v3.5.1",
"rev": "v3.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-75GQmp/ybD+VugrrB8qTbP3OPHy3eyBGe5u7CM7CRcc="
},
@@ -1336,29 +1336,29 @@
"vendorHash": "sha256-V0dK5G3zheyyqexBud+9Hg9ExYI/9X1wuYx+lEn6pVg="
},
"temporalcloud": {
"hash": "sha256-r5bkK+7phHxxImAQEgwekRiUuLxNzVGYSsb5OH8cx5c=",
"hash": "sha256-dsOBLWHDWMO2/VKQOvJP5WgdAS3Zo9mkqRbfEDvzQRk=",
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
"owner": "temporalio",
"repo": "terraform-provider-temporalcloud",
"rev": "v0.9.1",
"rev": "v0.9.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-PVN3oPT3cxsnWH03twbPSIIERGHCp3XAmcqrQAOULZ4="
},
"tencentcloud": {
"hash": "sha256-0sTuheQh9mpwGPsqXLH3dcLvTQcy7xti+y1k1eflL2k=",
"hash": "sha256-X5MhgP1ZxoaEAeUIIrTpF/YLfnsoy0k2RbNRXQzWKq4=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.82.13",
"rev": "v1.82.15",
"spdx": "MPL-2.0",
"vendorHash": null
},
"tfe": {
"hash": "sha256-Gut7HzjBZIrv9PLNBkSwnGfBKymlJ07GTFKtwiLIGSg=",
"hash": "sha256-wKHlkU/MmLoLjl3LbzYWK10Xl8c5Sb5ItvzoeJ1R/d0=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
"rev": "v0.68.1",
"rev": "v0.68.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tf78FT9JD5IVswgDB3Yug1NZQvo8NDqjPEAfF3gg93w="
},
@@ -1517,12 +1517,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
"hash": "sha256-W67wzWkbSaoRbntJhlErhQ5lOIyJdoIZFJUsBnzLP5o=",
"hash": "sha256-uVfwAoU2bOfy/ZBSK5kwGP2uWDVlS7NCdk4Uv8ZRgII=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.146.0",
"rev": "v0.148.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-DXZi6ncn/X4sx2i8xM7ItxGCuRwLi391LLJ7NlZkxFg="
"vendorHash": "sha256-EvEUTx/Y+LpIaDUY8LsXT+aMtLiNpYH8Z7XnNWLLCM4="
}
}

View File

@@ -316,10 +316,10 @@ buildStdenv.mkDerivation {
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
./139-wayland-drag-animation.patch
]
++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [
++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141.0.2") [
./139-relax-apple-sdk.patch
]
++ lib.optionals (lib.versionAtLeast version "142") [
++ lib.optionals (lib.versionAtLeast version "141.0.2") [
./142-relax-apple-sdk.patch
]
++ lib.optionals (lib.versionOlder version "139") [

View File

@@ -15,7 +15,7 @@ lib.makeOverridable (
fetchzip (
{
inherit name;
url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
url = "https://bitbucket.org/${owner}/${repo}/get/${lib.strings.escapeURL rev}.tar.gz";
meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
}
// removeAttrs args [

View File

@@ -0,0 +1,18 @@
{ testers, fetchFromBitbucket, ... }:
{
withEncodedWhitespace = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
name = "withWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
rev = "tag%20with%20encoded%20spaces";
sha256 = "sha256-Nf1Cvbx7Sbab8EeSSBU5baLBiuFYiQtITED+f4tfjC0=";
};
withoutWhitespace = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
name = "withoutWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
rev = "main";
sha256 = "sha256-eTd773gE1z4+Fl2YPBbbsrADD4Dr7sFGoOWgphXUhtE=";
};
}

View File

@@ -1,28 +1,28 @@
{
"stable": {
"linux": {
"version": "8.11.2",
"version": "8.11.4",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.2.x64.tar.gz",
"hash": "sha256-2yYzUO/ZdB/BA3wT+2fKM0ZzJzBpVH/N5xaIg50lzzo="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.4.x64.tar.gz",
"hash": "sha256-s/CV1hA8j3ivWEmKfwMd6Hh74BY86C0MZLDwjm6ROd4="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.2.arm64.tar.gz",
"hash": "sha256-slKgf7ahA6pFBR2V9L8mI7ROisARRY7M4IjB1UYhwvU="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.4.arm64.tar.gz",
"hash": "sha256-qljiVRVO0HlteI5oRQPLb6+JL282CwcbRydANUmNcRM="
}
}
},
"darwin": {
"version": "8.11.2",
"version": "8.11.4",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.2-x86_64.zip",
"hash": "sha256-jcfSjcAajkgRQP0JA//f4Ltc62nDeISFZxYuGObFMKA="
"url": "https://downloads.1password.com/mac/1Password-8.11.4-x86_64.zip",
"hash": "sha256-kv+TSoZcoCkL1Gr0dwgqtYK532wEnergVAwCMCv44/A="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.2-aarch64.zip",
"hash": "sha256-pdnEhTJCSod/VnbKVvCEqQzNjGwDPz28Or97+jLSwJk="
"url": "https://downloads.1password.com/mac/1Password-8.11.4-aarch64.zip",
"hash": "sha256-AhWPz/cwhBwSozZx6WrDPvCj73OIvBxXlsimM+FDFlA="
}
}
}

View File

@@ -1,84 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index df5a6e9..0cf72e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,7 +382,7 @@ dependencies = [
"anyhow",
"biome_rowan",
"rustc-hash",
- "tower-lsp 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-lsp",
]
[[package]]
@@ -1369,7 +1369,7 @@ dependencies = [
"time",
"tokio",
"tokio-util",
- "tower-lsp 0.20.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp",
"tracing",
"tracing-subscriber",
"tree-sitter",
@@ -1406,7 +1406,7 @@ dependencies = [
"serde_json",
"tokio",
"tokio-util",
- "tower-lsp 0.20.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp",
"tracing",
"url",
]
@@ -2311,29 +2311,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-[[package]]
-name = "tower-lsp"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"
-dependencies = [
- "async-trait",
- "auto_impl",
- "bytes",
- "dashmap 5.5.3",
- "futures",
- "httparse",
- "lsp-types",
- "memchr",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
- "tower",
- "tower-lsp-macros 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing",
-]
-
[[package]]
name = "tower-lsp"
version = "0.20.0"
@@ -2352,21 +2329,10 @@ dependencies = [
"tokio",
"tokio-util",
"tower",
- "tower-lsp-macros 0.9.0 (git+https://github.com/lionel-/tower-lsp?branch=bugfix%2Fpatches)",
+ "tower-lsp-macros",
"tracing",
]
-[[package]]
-name = "tower-lsp-macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
[[package]]
name = "tower-lsp-macros"
version = "0.9.0"

View File

@@ -7,19 +7,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "air-formatter";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "posit-dev";
repo = "air";
tag = finalAttrs.version;
hash = "sha256-jFOhTol5e3TcU217HgcCKutydTePmc5/viilgiJqpqE=";
hash = "sha256-FGucu5emmBtxVloun7Kh+MWKZDYdKw+75L7g3GqQ7Tw=";
};
# Remove duplicate entries from cargo lock
cargoPatches = [ ./cargo-lock.patch ];
cargoHash = "sha256-3v/pgm6BjPvQToSmZ2PrUWTrgffjifB3Xmp1liWCUck=";
cargoHash = "sha256-+cksQnHNXGyqbu+CoGhCEmQux7zfLIt5K5rWABfppDo=";
useNextest = true;

View File

@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bitwuzla";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = finalAttrs.version;
hash = "sha256-4Gf06aZ3iBEu0bNZAGgWCXVgKA0ew37Zf6XArnlVAXw=";
hash = "sha256-v5r+BWXUUbKtkos6qmGMC9MMytS/h759SHY6lsTHU1k=";
};
strictDeps = true;

View File

@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.28.29";
version = "2.28.31";
src =
passthru.sources.${stdenv.hostPlatform.system}
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "WIL8Y2pQq9vYuSI2fq2+T21HvjAd6PJPWKi4phKB5pw=";
sha256 = "v2MkLqTNG9creNZBBshTuhrMxlF4OIDlzQOgrEyKmMY=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "hcTVPb1zGrR3C1b5F2bgIzwH/lZV0ujeERNx0qt00Pc=";
sha256 = "hFJdO/YFxwCpWBmR8jZwmak2Fc9wgMwLax5puaLVEbs=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "7Qs47SjAhsOAIcCCCJk7jjDD1ab7CyjbPHfXl25z9mE=";
sha256 = "RDk4DE0x24m5yBBezlGuLQ/l7yugyd5SYvfYoDFfJuI=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "v4ApyuA9kMfqZAGVXPSSJJS0fm9lP2zz0iD8lf9VGa0=";
sha256 = "Xq0G0w2FJXEGVmXmyhbdzXY9OiZn4+5i8GypMOdeAhA=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "t78kpafSfbCA/0Kzhn/+/wjAet2qne33CYqFvRT0XUM=";
sha256 = "cHmh1JyPa2u2c6KGlZC1/hlDlxMSrDKY1jwaEcJVq0M=";
};
};

View File

@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "blisp";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "pine64";
repo = "blisp";
rev = "v${finalAttrs.version}";
hash = "sha256-cN35VLbdQFA3KTZ8PxgpbsLGXqfFhw5eh3nEBRZqAm4=";
hash = "sha256-qjZ5BNQR57J78Y6MT9I388OCLOiYTevPJ2btgmtkpJw=";
};
nativeBuildInputs = [

View File

@@ -12,13 +12,13 @@
buildNpmPackage rec {
pname = "blockbench";
version = "4.12.5";
version = "4.12.6";
src = fetchFromGitHub {
owner = "JannisX11";
repo = "blockbench";
tag = "v${version}";
hash = "sha256-u8NjwEsy3vimcvwtsUANckEx0Uz4vJLAiuUmN5lm5eQ=";
hash = "sha256-iV8qpUsUnL1n6hKADegNTmrW/AUWNiiNLxrTU4WPR30=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ buildNpmPackage rec {
copyDesktopItems
];
npmDepsHash = "sha256-WiBQpd8Qlw5QTXh3kB2dG4dGZ1zfpYst5MgfHoK8UU4=";
npmDepsHash = "sha256-ZLFmcK91SrUM+ouBENzc+MdNvQCRDh0ej4tf2TneUtQ=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

View File

@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-codspeed";
version = "3.0.2";
version = "3.0.5";
src = fetchFromGitHub {
owner = "CodSpeedHQ";
repo = "codspeed-rust";
rev = "v${version}";
hash = "sha256-u/6pQSmm069IVXfk7Jy7zCYiGz8yNRz8z3XrBG/1Td0=";
hash = "sha256-vQGPROaTkEwvKw+4aPpS1whUwfeqBcYWJTIKm4KnIiw=";
};
cargoHash = "sha256-OdP01hgJfkxV9htGEoUs/xgbyWDEiyxT3NQLbAlt4K8=";
cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M=";
nativeBuildInputs = [
curl

View File

@@ -16,6 +16,7 @@
let
pnpm = pnpm_9;
in
stdenv.mkDerivation (finalAttrs: {
pname = "test-app";
inherit (cargo-tauri) version src;
@@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
;
fetcherVersion = 1;
hash = "sha256-I++iYwqSxACmXFvfPYAnY/0WSWSY6ElJYnylJDC03D8=";
hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8=";
};
nativeBuildInputs = [

View File

@@ -25,14 +25,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.457";
version = "3.2.458";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-OxnnIu5+5V3c2gMtgHeUm1LRVMoR8X5MI4cnzgqwUnI=";
hash = "sha256-0tIDwUKYK4HIdvSu0xr01avwedlEKOF+COvfUHYn00o=";
};
pythonRelaxDeps = [

View File

@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.67"
"@anthropic-ai/claude-code": "^1.0.69"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.67",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.67.tgz",
"integrity": "sha512-r7CfhbKBXgaL5Wo0BIh08SOahFYQPcbHCNnMLtse7iDd2IVBWeOxqoiqQvzRQ0wTCiqLTshRbnmLWHyP4AbuyQ==",
"version": "1.0.69",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz",
"integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"

View File

@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.67";
version = "1.0.69";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-NZgv0nGsq+RuPTJcX0GsE1NWs/PFge2A0ek3BL1fJeY=";
hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM=";
};
npmDepsHash = "sha256-v994F0x0LCh+QbIfCywk5agxn7tNhhi+uo/3ka5Iuww=";
npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY=";
postPatch = ''
cp ${./package-lock.json} package-lock.json

View File

@@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clouddrive2";
version = "0.9.1";
version = "0.9.4";
src = fetchurl {
url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
hash =
{
x86_64-linux = "sha256-xm2kjCtfNvbZmVfd42UX+i4G44fqQsLP4V1iTCdm3PA=";
aarch64-linux = "sha256-HMzuRCSVBxwyuRxD23+Yk7bTrayDHi6X0JSvaGZJfvU=";
x86_64-darwin = "sha256-hIFCNtSFqjRCtx0/XHl7w5xeHSGrdXiKWLfq68J9GGU=";
aarch64-darwin = "sha256-CfATmkbXOlz7fGDGIMPQDAdcY6bxmOq1tcIsQbFGrwQ=";
x86_64-linux = "sha256-i6+YoZfCFaVcF7XO7wPo8AEpU0LrD4bcsIqLNz/V3aM=";
aarch64-linux = "sha256-BV+47uJnvH/Gapz7dACnXIM49x7u/MTdbXiFRGq2DVc=";
x86_64-darwin = "sha256-Jjsdx203akCmlveGZD1x8fO6V0N5d3AzGAFIAzgOkHs=";
aarch64-darwin = "sha256-DuSZoXTQyfC3CIwNGTsGuQNP410rK9qMBei5T7TZN7A=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View File

@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.64.0";
version = "11.66.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
tag = "v${version}";
hash = "sha256-AJ7aw21UyvOGCLEnhTHPklyDWkBAnK/Vhvvg4UDOoH4=";
hash = "sha256-almzd4ZVH5iu57iEXqQYUJVo9FaToptlfdrCEfjx/bU=";
};
proxyVendor = true;
vendorHash = "sha256-nmHs5ZHULENCyW+3giyPTO+pzbnGgGwFuVqgIfuCQi4=";
vendorHash = "sha256-7UiTjR75sfoFq/kKPCkyhm7NnKZZ3hKBziOzkS6MsfQ=";
subPackages = [ "apps/cnspec" ];

View File

@@ -16,7 +16,7 @@
buildGoModule rec {
pname = "containerd";
version = "2.1.3";
version = "2.1.4";
outputs = [
"out"
@@ -28,7 +28,7 @@ buildGoModule rec {
owner = "containerd";
repo = "containerd";
tag = "v${version}";
hash = "sha256-MqHcwomsVYbjziO0vIpGAcREChe5mbJVGsvM96bszLA=";
hash = "sha256-eC9mfB/FWDxOGucNizHBiRkhkEFDdSxu9vRnXZp5Tug=";
};
postPatch = "patchShebangs .";

View File

@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "containerlab";
version = "0.69.1";
version = "0.69.2";
src = fetchFromGitHub {
owner = "srl-labs";
repo = "containerlab";
tag = "v${finalAttrs.version}";
hash = "sha256-+KZrKOxn9M+iKtugH89bPc106NGLwErMgIyiaU2kcGE=";
hash = "sha256-wB51Q7spVe4H6ANIt+ug7s2r3sqFLTRsdMH3bgPNCKg=";
};
vendorHash = "sha256-YmE2eR5UnXy2nXTQP2FdyPQLAQVYPzDTmLrWtbRknAs=";
vendorHash = "sha256-28Q1R6P2rpER5RxagnsKy9W3b4FUeRRbkPPovzag//U=";
nativeBuildInputs = [
installShellFiles

View File

@@ -28,14 +28,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "deja-dup";
version = "48.2";
version = "48.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "deja-dup";
rev = finalAttrs.version;
hash = "sha256-g6bGOlpiEMJ9d+xe2GJyTBWAuGlY9EZTlJaYhB/5Ldw=";
hash = "sha256-3tjJljCdugfjfysd0afUYY7Gc1UcaP4w4jgxVDr5tBM=";
};
patches = [
@@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
and uses duplicity as the backend.
'';
homepage = "https://apps.gnome.org/DejaDup/";
changelog = "https://gitlab.gnome.org/World/deja-dup/-/releases/${finalAttrs.version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
teams = [ teams.gnome-circle ];

View File

@@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "dokieli";
version = "0-unstable-2025-07-11";
version = "0-unstable-2025-08-04";
src = fetchFromGitHub {
owner = "dokieli";
repo = "dokieli";
rev = "13c0c2d2d307ab1f391aca9aec4efc4ac4ba43c5";
hash = "sha256-V9tKoSu1r8LZaIZUu1JSyZ0dM7/zblTDQZHu86/V3LE=";
rev = "64374c6b9a53b68ae7921604a1fbe231d3e4f067";
hash = "sha256-5baBKXmOxS0BOKNedMSbmw21rDBONZwmim9hlXn5OzQ=";
};
missingHashes = ./missing-hashes.json;

View File

@@ -0,0 +1,40 @@
{
fetchFromGitHub,
lib,
rustPlatform,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "emmylua_doc_cli";
version = "0.10.0";
src = fetchFromGitHub {
owner = "EmmyLuaLs";
repo = "emmylua-analyzer-rust";
tag = finalAttrs.version;
hash = "sha256-Fvg3G0C/YECDEWZ4mDC5b8qocWvyDJ9KdLYNtwIu0+I=";
};
buildAndTestSubdir = "crates/emmylua_doc_cli";
cargoHash = "sha256-MIGYx1qMxsCCq3QkFeOuKbM4w/sJ2K0T+SRIDJQjf/8=";
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/emmylua_doc_cli";
versionCheckProgramArg = "--version";
doInstallCheck = true;
meta = {
description = "Professional documentation generator creating beautiful, searchable API docs from your Lua code and annotations.";
homepage = "https://github.com/EmmyLuaLs/emmylua-analyzer-rust";
changelog = "https://github.com/EmmyLuaLs/emmylua-analyzer-rust/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
mrcjkb
];
platforms = lib.platforms.all;
mainProgram = "emmylua_doc_cli";
};
})

View File

@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "enum4linux-ng";
version = "1.3.4";
version = "1.3.5";
pyproject = true;
src = fetchFromGitHub {
owner = "cddmp";
repo = "enum4linux-ng";
tag = "v${version}";
hash = "sha256-MN3AUubro9CHkdPe/X1xcE11ye/D/A+Kf6zUOJTN4l0=";
hash = "sha256-jwwBYpzMjaVVojMB1udkinNQDiOXPKWbOwIsWHlhWw4=";
};
build-system = with python3.pkgs; [ setuptools ];
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
enumerating information from Windows and Samba systems.
'';
homepage = "https://github.com/cddmp/enum4linux-ng";
changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/v${version}";
changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${src.tag}";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ fab ];
mainProgram = "enum4linux-ng";

View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "faudio";
version = "25.07";
version = "25.08";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
tag = finalAttrs.version;
hash = "sha256-ZMU3ntvnUHbeWQ5k5ZSnSLBABGm/F/rSAUM4blorpts=";
hash = "sha256-yhKmY5aysu1wIx0BDdQ6fyf5qn9XCwtNCIjDeJjBGg8=";
};
nativeBuildInputs = [ cmake ];

View File

@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.15.61";
version = "2.15.70";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-QYfZ9xRz9KtoXMkUlmLjYGTMNzBM7MZr/v8yjT/urLw=";
hash = "sha256-ImTa1h9Gh8yxtt7+P/9A3n5h7BV6pPZa7D4waeGZUZo=";
};
vendorHash = "sha256-Uw+69gRSSnFSFSgaw97vzzdQuX5W4qnKSDHPZM3ipmA=";
vendorHash = "sha256-LU7ImpklaGLGhEKDYhwMk7ZoUQ1UxVdNUTTOMEh5TZo=";
ldflags = [
"-s"

View File

@@ -9,16 +9,16 @@
}:
buildGoModule (finalAttrs: {
pname = "fluxcd-operator-mcp";
version = "0.24.1";
version = "0.26.0";
src = fetchFromGitHub {
owner = "controlplaneio-fluxcd";
repo = "fluxcd-operator";
tag = "v${finalAttrs.version}";
hash = "sha256-/a/k2q1Qu/0Zz7qxBtGB27CZ5vKhqAAIDUknRT8dK04=";
hash = "sha256-OT2H2veijX5l0QCpecLsq1vBR8+912MR3kojMICfFAg=";
};
vendorHash = "sha256-tyYE/OdVUxqNP3Csukc2ctDchB9x2BdBYXYq9EsiFkg=";
vendorHash = "sha256-w7WEckmoajsR4sKCrheq34T0XC2ubnZhz6cVQmzHzN0=";
ldflags = [
"-s"

View File

@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.3.161";
version = "0.3.164";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-ctE8X3vyNqbdYQuDrmCLmwy/EMGpJFRnlcjxnRji1Zo=";
hash = "sha256-pAWdyKBiDr1opIO9P0+4Fm2wwZXaL5Nt0YJiuB+mWHo=";
};
vendorHash = "sha256-OwxzdLXNPiQRq6mgvZaOs8tnNZQm0mYyzyPFUYcokb0=";
vendorHash = "sha256-l4EAOQeDLU+J7suKLzg+UAxrKGxoCpoPvQtj62u5VHE=";
subPackages = [ "." ];

View File

@@ -3,28 +3,58 @@
fetchFromGitHub,
esbuild,
buildNpmPackage,
makeWrapper,
formats,
inter,
databaseType ? "sqlite",
environmentVariables ? { },
}:
buildNpmPackage rec {
assert lib.assertOneOf "databaseType" databaseType [
"sqlite"
"pg"
];
let
db =
isLong:
if (databaseType == "sqlite") then
"sqlite"
else if isLong then
"postgresql"
else
"pg";
in
buildNpmPackage (finalAttrs: {
pname = "pangolin";
version = "1.2.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "fosrl";
repo = "pangolin";
tag = version;
hash = "sha256-2yrim4pr8cgIh/FBuGIuK+ycwImpMiz+m21H5qYARmU=";
tag = finalAttrs.version;
hash = "sha256-Cy5COyZAH0NPQDMpKUmweYWkyupDC2sNf2CP+EJ5GiE=";
};
npmDepsHash = "sha256-fi4e79Bk1LC/LizBJ+EhCjDzLR5ZocgVyWbSXsEJKdw=";
nativeBuildInputs = [ esbuild ];
# Replace the googleapis.com Inter font with a local copy from nixpkgs
# based on
# https://github.com/NixOS/nixpkgs/blob/f7bf574774e466b984063a44330384cdbca67d6c/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix
npmDepsHash = "sha256-OGqYmOO6pizcOrdaoSGgjDQgqpjU0SIw3ceh57eyjr4=";
nativeBuildInputs = [
esbuild
makeWrapper
];
prePatch = ''
cat > server/db/index.ts << EOF
export * from "./${db false}";
EOF
'';
# Replace the googleapis.com Inter font with a local copy from Nixpkgs.
# Based on pkgs.nextjs-ollama-llm-ui.
postPatch = ''
substituteInPlace src/app/layout.tsx --replace-fail \
"{ Figtree, Inter } from \"next/font/google\"" \
"{ Inter } from \"next/font/google\"" \
"localFont from \"next/font/local\""
substituteInPlace src/app/layout.tsx --replace-fail \
@@ -34,33 +64,105 @@ buildNpmPackage rec {
cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
'';
preBuild = ''
npx drizzle-kit generate --dialect sqlite --schema ./server/db/schemas/ --out init
'';
preBuild = "npx drizzle-kit generate --dialect ${db true} --schema ./server/db/${db false}/schema.ts --name migration --out init";
npmBuildScript = "build:${db false}";
postBuild = "npm run build:cli";
preInstall = "mkdir -p $out/{bin,share/pangolin}";
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r .next/standalone/* $out/
cp -r .next/standalone/.next $out/
cp -r node_modules $out/share/pangolin
cp -r .next/static $out/.next/static
cp -r dist $out/dist
cp -r init $out/dist/init
cp -r .next/standalone/.next $out/share/pangolin
cp .next/standalone/package.json $out/share/pangolin
cp -r .next/static $out/share/pangolin/.next/static
cp -r public $out/share/pangolin/public
cp -r dist $out/share/pangolin/dist
cp -r init $out/share/pangolin/dist/init
cp server/db/names.json $out/share/pangolin/dist/names.json
cp server/db/names.json $out/dist/names.json
cp -r public $out/public
cp -r node_modules $out/
runHook postInstall
'';
preFixup =
let
defaultConfig = (formats.yaml { }).generate "pangolin-default-config" {
app.dashboard_url = "https://pangolin.example.test";
domains.domain1.base_domain = "example.test";
gerbil.base_endpoint = "pangolin.example.test";
server.secret = "A secret string used for encrypting sensitive data. Must be at least 8 characters long.";
};
variablesMapped =
isServer:
(lib.concatMapAttrsStringSep " " (name: value: "--set ${name} ${value}") (
{
NODE_OPTIONS = "enable-source-maps";
NODE_ENV = "development";
ENVIRONMENT = "prod";
}
// environmentVariables
))
# If we're running Pangolin, test if we have a .nix_skip_setup file in the public
# and .next directories. If we don't, clean them up and re-create them.
+ lib.optionalString isServer " --run '${
(lib.concatMapStringsSep " && "
(
dir:
"test -f ${dir}/.nix_skip_setup || { rm -${lib.optionalString (dir == ".next") "r"}f ${dir} && ${
if (dir == ".next") then "cp -rd" else "ln -s"
} ${placeholder "out"}/share/pangolin/${dir} .; }"
)
[
".next"
"public"
"node_modules"
]
)
# Also deploy a small config (if none exists) and run the
# database migrations before running the server.
} && test -f config/config.yml || { install -Dm600 ${defaultConfig} config/config.yml && { test -z $EDITOR && { echo \"Please edit $(pwd)/config/config.yml\" and run the server again. && exit 255; } || $EDITOR config/config.yml; }; } && command ${placeholder "out"}/bin/migrate-pangolin-database'";
in
lib.concatMapStrings
(
attr:
"makeWrapper $out/share/pangolin/dist/${attr.mjs}.mjs $out/bin/${attr.command} ${
variablesMapped (attr.mjs == "server")
}\n"
)
[
{
mjs = "cli";
command = "pangctl";
}
{
mjs = "migrations";
command = "migrate-pangolin-database";
}
{
mjs = "server";
command = "pangolin";
}
];
passthru = { inherit databaseType; };
meta = {
description = "Tunneled reverse proxy server with identity and access control";
homepage = "https://github.com/fosrl/pangolin";
changelog = "https://github.com/fosrl/pangolin/releases/tag/${version}";
changelog = "https://github.com/fosrl/pangolin/releases/tag/${finalAttrs.version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ jackr ];
maintainers = with lib.maintainers; [
jackr
sigmasquadron
];
platforms = lib.platforms.linux;
mainProgram = "pangolin";
};
}
})

View File

@@ -12,13 +12,13 @@
buildGoModule rec {
pname = "fzf";
version = "0.65.0";
version = "0.65.1";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf";
rev = "v${version}";
hash = "sha256-8I6NpZsnqGw8eOoKM5PmRQzahsss01WQFjjDJ5e7pTE=";
hash = "sha256-cYRA7TCKvfFkWUpI4q1xYR3qzenZvx3cjVSerl0gweU=";
};
vendorHash = "sha256-1wxi+wfTSSgJQLNbCdoFTz9G4XLgEX7PpzqpuVjEYL8=";

View File

@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.78";
version = "1.0.79";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-V/h0X4CZ9FOcUetyyvo9umYS+VqJbYehg3QS/yp4OBM=";
hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";

View File

@@ -6,7 +6,7 @@
let
pname = "gate";
version = "0.51.0";
version = "0.52.0";
in
buildGoModule {
inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
owner = "minekube";
repo = "gate";
tag = "v${version}";
hash = "sha256-Fe02QzD9ZtYT+pakWWjwM48dqe7SeF011/FafbvGc0E=";
hash = "sha256-DKnJnhfO3Cs80tAYiodxf1alfO4DXNneiqDILgP+v8w=";
};
vendorHash = "sha256-d/D1l+/viJ5OFSpUDpC+4pnDwPJDBuYDjS7niao5D9U=";
vendorHash = "sha256-0NcfuCZHR4QHbMNqc+ilPouie+9k7FqOG/JdNX8uO8c=";
ldflags = [
"-s"

View File

@@ -24,8 +24,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "jul25b";
version = "20250701_b";
srcVersion = "aug25a";
version = "20250801_a";
pname = "gildas";
src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
];
hash = "sha256-TU9UdvyzlIWGJWAAJIIGBO5NgXuKDYTdjHhFHRwTagU=";
hash = "sha256-SqUE/cu23+i7QuGw7LFnLfP1hViUW4moJKfshu/3yXI=";
};
nativeBuildInputs = [

View File

@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "github-mcp-server";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "github";
repo = "github-mcp-server";
tag = "v${finalAttrs.version}";
hash = "sha256-Eqo3ZUfELSXzRQOcz0JGMhve6drznZv17XmpP0e5HtI=";
hash = "sha256-I7Y2vZdQllT8wVttf+axwvBF7Cv4gYM4vxw7qKEmhog=";
};
vendorHash = "sha256-DeojCgMBwVclvoiEs462FoxIf3700XUjXvPbvRZE3CI=";

View File

@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
buildDotnetModule (finalAttrs: {
pname = "github-runner";
version = "2.326.0";
version = "2.327.1";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
tag = "v${finalAttrs.version}";
hash = "sha256-bKOxTV6iAvC+QOsfSs1hTS9k/Ou+YGEwTr5hew23cLY=";
hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision

View File

@@ -1,18 +1,18 @@
{
lib,
python3Packages,
fetchFromGitHub,
buildPythonApplication,
installShellFiles,
}:
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "grc";
version = "1.13";
format = "other";
src = fetchFromGitHub {
owner = "garabik";
repo = pname;
repo = "grc";
rev = "v${version}";
sha256 = "1h0h88h484a9796hai0wasi1xmjxxhpyxgixn6fgdyc5h69gv8nl";
};
@@ -39,20 +39,20 @@ buildPythonApplication rec {
runHook postInstall
'';
meta = with lib; {
meta = {
homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/grc.html";
description = "Generic text colouriser";
longDescription = ''
Generic Colouriser is yet another colouriser (written in Python) for
beautifying your logfiles or output of commands.
'';
license = licenses.gpl2Plus;
maintainers = with maintainers; [
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [
azahi
lovek323
peterhoeg
];
platforms = platforms.unix;
platforms = lib.platforms.unix;
mainProgram = "grc";
};
}

View File

@@ -5,17 +5,24 @@
pam,
scdoc,
installShellFiles,
nix-update-script,
# legacy passthrus
gtkgreet,
qtgreet,
regreet,
tuigreet,
wlgreet,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "greetd";
version = "0.10.3";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = pname;
rev = version;
sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
repo = "greetd";
rev = finalAttrs.version;
hash = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
};
cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY=";
@@ -37,7 +44,26 @@ rustPlatform.buildRustPackage rec {
installManPage man/*
'';
meta = with lib; {
# Added 2025-07-23. To be deleted on 26.05
passthru =
let
warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`";
in
lib.mapAttrs warnPassthru {
inherit
gtkgreet
qtgreet
regreet
tuigreet
wlgreet
;
}
// {
greetd = warnPassthru "greetd" finalAttrs.finalPackage;
updateScript = nix-update-script { };
};
meta = {
description = "Minimal and flexible login manager daemon";
longDescription = ''
greetd is a minimal and flexible login manager daemon
@@ -46,8 +72,8 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://sr.ht/~kennylevinsen/greetd/";
mainProgram = "greetd";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
})

View File

@@ -12,17 +12,18 @@
json_c,
librsvg,
scdoc,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gtkgreet";
version = "0.8";
src = fetchFromSourcehut {
owner = "~kennylevinsen";
repo = pname;
rev = version;
sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8=";
repo = "gtkgreet";
rev = finalAttrs.version;
hash = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8=";
};
depsBuildBuild = [ pkg-config ];
@@ -54,12 +55,14 @@ stdenv.mkDerivation rec {
# G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+.
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "GTK based greeter for greetd, to be run under cage or similar";
homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
mainProgram = "gtkgreet";
};
}
})

View File

@@ -23,13 +23,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "h2o";
version = "2.3.0.20250519";
version = "2.3.0.20250717";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "87e2aa634f2c0d9f3d9429f7a3cf273f98db0058";
sha256 = "sha256-/9YnaOqvYmFme4/mFq8Sx78FMDyGwnErEW45qPVELjU=";
rev = "db98b59ba7abfcd1dc9b43ea4b9ad1052aba775e";
sha256 = "sha256-vBA5TWyvtaaBZV4RmfAAA7F34fXNkROS0rbZRpEJgrc=";
};
outputs = [

View File

@@ -102,6 +102,7 @@ let
NetAmazonS3
NetPrometheus
NetStatsd
NumberBytesHuman
PadWalker
ParallelForkManager
PerlCriticCommunity
@@ -130,14 +131,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2025-07-17";
version = "0-unstable-2025-08-05";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "b812bb5017cac055fa56ffeac5440b6365830d67";
hash = "sha256-XmoecWRUvUX8jf0U0cGyP4AfLHb0D2D4Ec69jqwrWVI=";
rev = "79ba8fdd04ba53826aa9aaba6e25fd0d6952b3b3";
hash = "sha256-h8UNR3LVrD313iX1OazDwIcMLksh0p6oJv9msEfjS0E=";
};
outputs = [

View File

@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "hyprls";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "hyprls";
rev = "v${version}";
hash = "sha256-cJDDyF44nD/XvxtaGPYCk2MC574HDBHP1ByhVwqatvQ=";
hash = "sha256-txJSqXIkIYmjg/k5enChHHwJaoAhJ2c6hMHjS/i4v5c=";
};
vendorHash = "sha256-WTdwIAC3gDWgCKlVuOtMyl0ZfdZ9RhlpqUl2S2d65HA=";
vendorHash = "sha256-a2OdESOXrinALzC2AJ0cudMsDwzdi1Jl2kckI0OratA=";
checkFlags = [
# Not yet implemented

View File

@@ -15,11 +15,11 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "inspec";
meta = with lib; {
meta = {
description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements";
homepage = "https://inspec.io/";
license = licenses.asl20;
maintainers = with maintainers; [ dylanmtaylor ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dylanmtaylor ];
mainProgram = "inspec";
};
}

View File

@@ -7,13 +7,13 @@
buildGoModule (finalAttrs: {
pname = "jdd";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "mahyarmirrashed";
repo = "jdd";
tag = "v${finalAttrs.version}";
hash = "sha256-JeF6dsExfQ+d5F8RWmfGbr7CIl6akOTlLI2jxx/dES0=";
hash = "sha256-3keJrKbR3+J3z22W8Xoabz9YhvjRRBBMo59l/eJo7Hs=";
};
vendorHash = "sha256-KEg5X2wHx7KPHEL1zJd/DeDnR69FyB6pajpHIYdep2k=";

View File

@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jujutsu";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "jj-vcs";
repo = "jj";
tag = "v${finalAttrs.version}";
hash = "sha256-4zDHSpi7Kk7rramrWFOlBelZnOxt0zgXIrHucYQUOz0=";
hash = "sha256-TFKUz8hUCRM9RPkp9CBvKnd4e+TnR8H5t9/N76cAKzI=";
};
cargoHash = "sha256-QmMc7pG2FMJBI9AIGPRRh2juFoz7gRFw5CQIcNK6QZI=";
cargoHash = "sha256-QWbAXqOysIZ7vUeBqAL/iP2QJBHgkZwjsUIregPNezg=";
nativeBuildInputs = [
installShellFiles

View File

@@ -21,23 +21,23 @@ let
in
clangStdenv.mkDerivation (finalAttrs: {
pname = "julec";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "julelang";
repo = "jule";
tag = "jule${finalAttrs.version}";
name = "jule-${finalAttrs.version}";
hash = "sha256-gFlca9XdRNv2CI3jfMiWejcmGGzabP0VGs4vlvFs72o=";
hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k=";
};
irSrc = fetchFromGitHub {
owner = "julelang";
repo = "julec-ir";
# revision determined by the upstream commit hash in julec-ir/README.md
rev = "4a3bf4fc84b53aa607855df6635d95d3e310f7ad";
rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f";
name = "jule-ir-${finalAttrs.version}";
hash = "sha256-Wl5AYRGYcQpj/R9nynxNC5r1HK1EmImwkLokdZfp9sE=";
hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE=";
};
dontConfigure = true;
@@ -65,6 +65,10 @@ clangStdenv.mkDerivation (finalAttrs: {
-Wno-everything \
-fwrapv \
-ffloat-store \
-fno-fast-math \
-fno-rounding-math \
-ffp-contract=fast \
-fexcess-precision=standard \
-DNDEBUG \
-fomit-frame-pointer \
-fno-strict-aliasing \

View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "just-lsp";
version = "0.2.4";
version = "0.2.5";
src = fetchFromGitHub {
owner = "terror";
repo = "just-lsp";
tag = finalAttrs.version;
hash = "sha256-0bt/kovzOgqAaIKArrh0G9ncuD1J7K3OINg9Dpa7fXs=";
hash = "sha256-cHDkcUsrrz71GqchkKT4yU1h6WzrT/zZPs95MJvb2tU=";
};
cargoHash = "sha256-DU8E3r9pjLYYxCEq+6dT2hrV2gDyGbtWD/N0aQFVyZI=";
cargoHash = "sha256-0CgwovZ9AtQs5AHulKxe1jHxG+EcyrCUyoEpxV/oDxY=";
passthru = {
updateScript = nix-update-script { };

View File

@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "jx";
version = "3.16.1";
version = "3.16.16";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
sha256 = "sha256-pvFSvaPdqq2uBDdn723TyGzz0MxNjM/MtI/1llcAxFI=";
sha256 = "sha256-42PqWzRCgA0DmCxUYs8pvOwwdXVdiUTQ59JKFWHgg8A=";
};
vendorHash = "sha256-qCcwCsinzkjN+g7wxn60JoFBGk6Swydi93w3dZNpsZY=";

View File

@@ -2,6 +2,5 @@ import ./generic.nix {
version = "1.5.0";
hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
patchDir = ./patches/1_5;
unsupported = true;
}

View File

@@ -2,5 +2,5 @@ import ./generic.nix {
version = "1.6.4";
hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";
cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";
patchDir = ./patches/1_6;
eolDate = "2025-09-01";
}

View File

@@ -0,0 +1,5 @@
import ./generic.nix {
version = "1.7.1";
hash = "sha256-CG4s6fYxTM2I/kFjD905g8/DSFkyB+0pnGVXgyRXtlE=";
cargoHash = "sha256-9bE3hSCFBJF8f3Lm5SzEuDtEpJBbCBijUDfqGiPnRsc=";
}

View File

@@ -19,6 +19,7 @@ For example, when upgrading from 1.4 -> 1.5
1. `cp -r pkgs/by-name/ka/kanidm/patches/1_4 pkgs/by-name/ka/kanidm/patches/1_5`
1. Update `1_5.nix` hashes/paths, and as needed for upstream changes, `generic.nix`
1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default
1. Update the previous release, e.g. `1_4.nix` and set `eolDate = "YYYY-MM-DD"` where the date is 30 days from release of 1.5.
1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported
### Update default

View File

@@ -2,9 +2,8 @@
version,
hash,
cargoHash,
patchDir,
extraMeta ? { },
unsupported ? false,
eolDate ? null,
}:
{
@@ -35,8 +34,24 @@
let
arch = if stdenv.hostPlatform.isx86_64 then "x86_64" else "generic";
versionUnderscored = builtins.replaceStrings [ "." ] [ "_" ] (
lib.versions.majorMinor kanidm.version
);
provisionPatches = [
(./. + "/provision-patches/${versionUnderscored}/oauth2-basic-secret-modify.patch")
(./. + "/provision-patches/${versionUnderscored}/recover-account.patch")
];
upgradeNote = ''
Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the
next version with `services.kanidm.package = pkgs.kanidm_1_x;`
See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html
'';
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning");
inherit version cargoHash;
@@ -49,16 +64,13 @@ rustPlatform.buildRustPackage rec {
inherit hash;
};
KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
env.KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
patches = lib.optionals enableSecretProvisioning [
"${patchDir}/oauth2-basic-secret-modify.patch"
"${patchDir}/recover-account.patch"
];
patches = lib.optionals enableSecretProvisioning provisionPatches;
postPatch =
let
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
format = (formats.toml { }).generate "${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml";
socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket";
profile = {
cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";
@@ -70,23 +82,11 @@ rustPlatform.buildRustPackage rec {
server_admin_bind_path = socket_path;
server_config_path = "/etc/kanidm/server.toml";
server_ui_pkg_path = "@htmx_ui_pkg_path@";
}
// lib.optionalAttrs (lib.versionOlder version "1.5") {
admin_bind_path = socket_path;
default_config_path = "/etc/kanidm/server.toml";
default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
htmx_ui_pkg_path = "@htmx_ui_pkg_path@";
}
// lib.optionalAttrs (lib.versions.majorMinor version == "1.3") {
web_ui_pkg_path = "@web_ui_pkg_path@";
};
in
''
cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg"
''
+ lib.optionalString (lib.versions.majorMinor version == "1.3") ''
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml --replace-fail '@web_ui_pkg_path@' "$out/ui/pkg"
cp ${format profile} libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml
substituteInPlace libs/profiles/${finalAttrs.env.KANIDM_BUILD_PROFILE}.toml --replace-fail '@htmx_ui_pkg_path@' "$out/ui/hpkg"
'';
nativeBuildInputs = [
@@ -108,9 +108,6 @@ rustPlatform.buildRustPackage rec {
postBuild = ''
mkdir -p $out/ui
cp -r server/core/static $out/ui/hpkg
''
+ lib.optionalString (lib.versions.majorMinor version == "1.3") ''
cp -r server/web_ui/pkg $out/ui/pkg
'';
# Upstream runs with the Rust equivalent of -Werror,
@@ -139,48 +136,48 @@ rustPlatform.buildRustPackage rec {
passthru = {
tests = {
inherit (nixosTests) kanidm kanidm-provisioning;
kanidm = nixosTests.kanidm versionUnderscored;
kanidm-provisioning = nixosTests.kanidm-provisioning versionUnderscored;
};
updateScript = lib.optionals (!enableSecretProvisioning) (nix-update-script {
# avoid spurious releases and tags such as "debs"
extraArgs = [
"-vr"
"v([0-9\\.]*)"
"v(${lib.versions.major kanidm.version}\\.${lib.versions.minor kanidm.version}\\.[0-9]*)"
"--override-filename"
"pkgs/by-name/ka/kanidm/${
builtins.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor kanidm.version)
}.nix"
"pkgs/by-name/ka/kanidm/${versionUnderscored}.nix"
];
});
inherit enableSecretProvisioning;
withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; };
eolMessage = lib.optionalString (eolDate != null) ''
kanidm ${lib.versions.majorMinor version} is deprecated and will reach end-of-life on ${eolDate}
${upgradeNote}
'';
};
# can take over 4 hours on 2 cores and needs 16GB+ RAM
requiredSystemFeatures = [ "big-parallel" ];
meta =
with lib;
{
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";
description = "Simple, secure and fast identity management platform";
homepage = "https://github.com/kanidm/kanidm";
license = licenses.mpl20;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [
adamcstephens
Flakebi
];
knownVulnerabilities = lib.optionals unsupported [
''
kanidm ${version} has reached EOL.
meta = {
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";
description = "Simple, secure and fast identity management platform";
homepage = "https://github.com/kanidm/kanidm";
license = lib.licenses.mpl20;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [
adamcstephens
Flakebi
];
knownVulnerabilities = lib.optionals unsupported [
''
kanidm ${lib.versions.majorMinor version} has reached end-of-life.
Please upgrade by verifying `kanidmd domain upgrade-check` and choosing the next version with `services.kanidm.package = pkgs.kanidm_1_x;`
See upgrade guide at https://kanidm.github.io/kanidm/master/server_updates.html
''
];
}
// extraMeta;
}
${upgradeNote}
''
];
};
})

Some files were not shown because too many files have changed in this diff Show More