Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-13 00:17:46 +00:00
committed by GitHub
107 changed files with 2047 additions and 2668 deletions
+6
View File
@@ -15189,6 +15189,12 @@
githubId = 1422781;
name = "Will Young";
};
loucass003 = {
name = "Lucas Lelievre";
email = "loucass003@gmail.com";
github = "loucass003";
githubId = 3948904;
};
louis-thevenet = {
name = "Louis Thevenet";
github = "louis-thevenet";
@@ -8,7 +8,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- NixOS now has initial support for the [**COSMIC DE**](https://system76.com/cosmic) which is currently at **Alpha 7**. COSMIC is a Rust-based Desktop Environment by System76, makers of Pop!_OS. You can use COSMIC by enabling the greeter (login manager) with [](#opt-services.displayManager.cosmic-greeter.enable), and the DE itself by enabling [](#opt-services.desktopManager.cosmic.enable). The support in NixOS/Nixpkgs is stable but still considered experimental because of the recent the addition. The COSMIC maintainers will be waiting for one more release of NixOS to determine if the experimental tag should be removed or not. Until then, please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [](#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting {option}`system.rebuild.enableNg` in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
- A `nixos-rebuild build-image` sub-command has been added.
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`.
@@ -22,7 +22,7 @@
- `networking.firewall` now has a `backend` option for choosing which backend to use.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is enabled by default from this release. You can disable it by setting [](#opt-system.rebuild.enableNg) to `false` in your configuration if you need, but please report any issues. It is expected that the next major version of NixOS (26.05) will remove the {option}`system.rebuild.enableNg` option.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is enabled by default from this release. You can disable it by setting {option}`system.rebuild.enableNg` to `false` in your configuration if you need, but please report any issues. It is expected that the next major version of NixOS (26.05) will remove the {option}`system.rebuild.enableNg` option.
- `rEFInd`, a graphical boot manager for UEFI systems, can now be used through [](#opt-boot.loader.refind.enable).
@@ -41,6 +41,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
- The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.
## Other Notable Changes {#sec-release-26.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+29 -20
View File
@@ -1,41 +1,50 @@
{
lib,
python3Packages,
enableOCR ? false,
qemu_pkg ? qemu_test,
buildPythonApplication,
colorama,
coreutils,
imagemagick_light,
netpbm,
qemu_test,
socat,
ipython,
junit-xml,
mypy,
ptpython,
python,
ruff,
remote-pdb,
netpbm,
nixosTests,
qemu_pkg ? qemu_test,
qemu_test,
setuptools,
socat,
tesseract4,
vde2,
enableOCR ? false,
extraPythonPackages ? (_: [ ]),
nixosTests,
}:
python3Packages.buildPythonApplication {
buildPythonApplication {
pname = "nixos-test-driver";
version = "1.1";
pyproject = true;
src = ./src;
build-system = with python3Packages; [
build-system = [
setuptools
];
dependencies =
with python3Packages;
[
colorama
junit-xml
ptpython
ipython
remote-pdb
]
++ extraPythonPackages python3Packages;
dependencies = [
colorama
ipython
junit-xml
ptpython
remote-pdb
]
++ extraPythonPackages python.pkgs;
propagatedBuildInputs = [
coreutils
@@ -55,7 +64,7 @@ python3Packages.buildPythonApplication {
doCheck = true;
nativeCheckInputs = with python3Packages; [
nativeCheckInputs = [
mypy
ruff
];
+1 -1
View File
@@ -9,7 +9,7 @@ let
# Reifies and correctly wraps the python test driver for
# the respective qemu version and with or without ocr support
testDriver = hostPkgs.callPackage ../test-driver {
testDriver = hostPkgs.python3Packages.callPackage ../test-driver {
inherit (config) enableOCR extraPythonPackages;
qemu_pkg = config.qemu.package;
imagemagick_light = hostPkgs.imagemagick_light.override { inherit (hostPkgs) libtiff; };
+5 -18
View File
@@ -68,11 +68,8 @@ let
};
nixos-install = pkgs.nixos-install.override { };
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; };
nixos-rebuild-ng = pkgs.nixos-rebuild-ng.override {
nix = config.nix.package;
withNgSuffix = false;
withReexec = true;
};
defaultFlakeTemplate = ''
@@ -279,14 +276,6 @@ in
'';
};
options.system.rebuild.enableNg = lib.mkEnableOption "" // {
default = true;
description = ''
Whether to use nixos-rebuild-ng in place of nixos-rebuild, the
Python-based re-implementation of the original in Bash.
'';
};
imports =
let
mkToolModule =
@@ -326,21 +315,19 @@ in
name = "nixos-version";
package = nixos-version;
})
(lib.mkRemovedOptionModule [ "system" "rebuild" "enableNg" ] ''
The Bash implementation of nixos-rebuild has been removed in favor of the new Python implementation.
If you have any issues with the new implementation, please create an issue in GitHub and tag the maintainers of 'nixos-rebuild-ng'.
'')
];
config = {
documentation.man.man-db.skipPackages = [ nixos-version ];
warnings = lib.optional (!config.system.disableInstallerTools && !config.system.rebuild.enableNg) ''
The Bash implementation of nixos-rebuild will be deprecated and removed in the 26.05 release of NixOS.
Please migrate to the newer implementation by removing 'system.rebuild.enableNg = false' from your configuration.
If you are unable to migrate due to any issues with the new implementation, please create an issue and tag the maintainers of 'nixos-rebuild-ng'.
'';
# These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
system.build = {
inherit nixos-generate-config nixos-install;
nixos-rebuild = if config.system.rebuild.enableNg then nixos-rebuild-ng else nixos-rebuild;
nixos-rebuild = nixos-rebuild-ng;
};
};
}
+33 -7
View File
@@ -25,11 +25,24 @@ in
default = [ "cockpit" ];
};
plugins = lib.mkOption {
type = types.listOf types.package;
default = [ ];
description = ''
List of cockpit plugins.
This add the passthru.cockpitPath of the packages to the systemd cockpit service.
'';
example = lib.literalExpression ''
[
pkgs.cockpit-zfs
]
'';
};
allowed-origins = lib.mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
List of allowed origins.
@@ -71,11 +84,6 @@ in
};
config = mkIf cfg.enable {
# expose cockpit-bridge system-wide
environment.systemPackages = [ cfg.package ];
# allow cockpit to find its plugins
environment.pathsToLink = [ "/share/cockpit" ];
environment.etc = {
# generate cockpit settings
@@ -90,6 +98,24 @@ in
enable = cfg.showBanner;
source = "/run/cockpit/issue";
};
# Add plugins in discoverable folder
"cockpit/share/cockpit".source = "${
pkgs.buildEnv {
name = "cockpit-plugins";
paths = cfg.plugins ++ [ cfg.package ];
pathsToLink = [ "/share/cockpit" ];
}
}/share/cockpit";
# Add plugins dependencies
"cockpit/bin".source = "${
pkgs.buildEnv {
name = "cockpit-path";
paths = lib.concatMap (p: p.passthru.cockpitPath or [ ]) cfg.plugins;
pathsToLink = [ "/bin" ];
}
}/bin";
};
security.pam.services.cockpit = {
@@ -115,7 +115,7 @@ in
KEEP_FULL_TOPIC = toConfigBoolean cfg.keepFullTopic;
LOG_LEVEL = cfg.logLevel;
LOG_MQTT_MESSAGE = toConfigBoolean cfg.logMqttMessage;
MQTT_IGNORED_TOPIC = toConfigList cfg.mqttIgnoredTopics;
MQTT_IGNORED_TOPICS = toConfigList cfg.mqttIgnoredTopics;
MQTT_ADDRESS = cfg.mqttAddress;
MQTT_PORT = toString cfg.mqttPort;
MQTT_TOPIC = cfg.mqttTopic;
+1 -14
View File
@@ -1087,25 +1087,12 @@ in
nixos-generate-config = runTest ./nixos-generate-config.nix;
nixos-rebuild-install-bootloader = handleTestOn [
"x86_64-linux"
] ./nixos-rebuild-install-bootloader.nix { withNg = false; };
nixos-rebuild-install-bootloader-ng = handleTestOn [
"x86_64-linux"
] ./nixos-rebuild-install-bootloader.nix { withNg = true; };
] ./nixos-rebuild-install-bootloader.nix { };
nixos-rebuild-specialisations = runTestOn [ "x86_64-linux" ] {
imports = [ ./nixos-rebuild-specialisations.nix ];
_module.args.withNg = false;
};
nixos-rebuild-specialisations-ng = runTestOn [ "x86_64-linux" ] {
imports = [ ./nixos-rebuild-specialisations.nix ];
_module.args.withNg = true;
};
nixos-rebuild-target-host = runTest {
imports = [ ./nixos-rebuild-target-host.nix ];
_module.args.withNg = false;
};
nixos-rebuild-target-host-ng = runTest {
imports = [ ./nixos-rebuild-target-host.nix ];
_module.args.withNg = true;
};
nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
nixseparatedebuginfod2 = runTest ./nixseparatedebuginfod2.nix;
+69
View File
@@ -3,6 +3,63 @@
let
user = "alice"; # from ./common/user-account.nix
password = "foobar"; # from ./common/user-account.nix
# A minimal Cockpit plugin that runs `hello` and displays the output
# This tests that the cockpitPath mechanism works correctly
helloPlugin =
pkgs.runCommand "cockpit-hello-test" { } ''
mkdir -p $out/share/cockpit/hello-test
cat > $out/share/cockpit/hello-test/manifest.json << 'EOF'
{
"name": "hello-test",
"menu": {
"index": {
"label": "Hello Test",
"order": 100
}
}
}
EOF
cat > $out/share/cockpit/hello-test/index.html << 'EOF'
<!DOCTYPE html>
<html>
<head>
<title>Hello Test</title>
<meta charset="utf-8">
<script src="../base1/cockpit.js"></script>
</head>
<body>
<h1>Hello Test Plugin</h1>
<div id="output">Loading...</div>
<script src="test.js"></script>
</body>
</html>
EOF
cat > $out/share/cockpit/hello-test/test.js << 'EOF'
(function() {
var output = document.getElementById("output");
if (typeof cockpit === "undefined") {
output.innerText = "FAILED: cockpit.js not loaded";
return;
}
cockpit.spawn(["hello"], { err: "message" })
.then(function(data) {
output.innerText = "SUCCESS: " + data;
})
.catch(function(error) {
output.innerText = "FAILED: " + (error ? error.message : "unknown error");
});
})();
EOF
''
// {
passthru.cockpitPath = [ pkgs.hello ];
};
in
{
name = "cockpit";
@@ -22,6 +79,7 @@ in
enable = true;
port = 7890;
openFirewall = true;
plugins = [ helloPlugin ];
allowed-origins = [
"https://server:${toString config.services.cockpit.port}"
];
@@ -129,6 +187,17 @@ in
assert '/nonexistent' not in driver.page_source
assert len(driver.find_elements(By.CSS_SELECTOR, '#machine-reconnect')) == 0
log("Checking plugin path")
driver.get("https://server:7890/hello-test")
sleep(2)
for iframe in driver.find_elements(By.TAG_NAME, "iframe"):
if "hello-test" in (iframe.get_attribute("src") or ""):
driver.switch_to.frame(iframe)
break
text = driver.find_element(By.ID, "output").text
sleep(1)
assert "SUCCESS: Hello, world!" in text, f"Plugin failed: {text}"
driver.close()
'';
in
+1 -4
View File
@@ -726,10 +726,7 @@ let
libxml2.bin
libxslt.bin
nixos-artwork.wallpapers.simple-dark-gray-bottom
(nixos-rebuild-ng.override {
withNgSuffix = false;
withReexec = true;
})
nixos-rebuild-ng
ntp
perlPackages.ConfigIniFiles
perlPackages.FileSlurp
@@ -1,10 +1,5 @@
import ./make-test-python.nix (
{
pkgs,
lib,
withNg ? false,
...
}:
{ pkgs, lib, ... }:
{
name = "nixos-rebuild-install-bootloader";
@@ -24,7 +19,6 @@ import ./make-test-python.nix (
};
system.includeBuildDependencies = true;
system.rebuild.enableNg = withNg;
virtualisation = {
cores = 2;
@@ -52,7 +46,6 @@ import ./make-test-python.nix (
forceInstall = true;
};
system.rebuild.enableNg = ${lib.boolToString withNg};
documentation.enable = false;
}
'';
@@ -1,9 +1,4 @@
{
hostPkgs,
lib,
withNg,
...
}:
{ hostPkgs, ... }:
{
name = "nixos-rebuild-specialisations";
@@ -33,7 +28,6 @@
pkgs.grub2
];
system.rebuild.enableNg = withNg;
system.switch.enable = true;
virtualisation = {
@@ -66,8 +60,6 @@
(pkgs.writeShellScriptBin "parent" "")
];
system.rebuild.enableNg = ${lib.boolToString withNg};
specialisation.foo = {
inheritParentConfig = true;
+9 -32
View File
@@ -1,9 +1,4 @@
{
hostPkgs,
lib,
withNg,
...
}:
{ hostPkgs, ... }:
{
name = "nixos-rebuild-target-host";
@@ -26,20 +21,15 @@
connect-timeout = 1;
};
environment.systemPackages = [ pkgs.passh ];
system.includeBuildDependencies = true;
virtualisation = {
cores = 2;
memorySize = 2048;
memorySize = 3072;
};
system.build.privateKey = snakeOilPrivateKey;
system.build.publicKey = snakeOilPublicKey;
# We don't switch on `deployer`, but we need it to have the dependencies
# available, to be picked up by system.includeBuildDependencies above.
system.rebuild.enableNg = withNg;
system.switch.enable = true;
};
@@ -130,19 +120,13 @@
forceInstall = true;
};
system.rebuild.enableNg = ${lib.boolToString withNg};
${lib.optionalString withNg # nix
''
nixpkgs.overlays = [
(final: prev: {
# Set tmpdir inside nixos-rebuild-ng to test
# "Deploy works with very long TMPDIR"
nixos-rebuild-ng = prev.nixos-rebuild-ng.override { withTmpdir = "/tmp"; };
})
];
''
}
nixpkgs.overlays = [
(final: prev: {
# Set tmpdir inside nixos-rebuild-ng to test
# "Deploy works with very long TMPDIR"
nixos-rebuild-ng = prev.nixos-rebuild-ng.override { withTmpdir = "/tmp"; };
})
];
# this will be asserted
networking.hostName = "${hostname}";
@@ -163,7 +147,6 @@
deployer.copy_from_host("${configFile "config-1-deployed"}", "/root/configuration-1.nix")
deployer.copy_from_host("${configFile "config-2-deployed"}", "/root/configuration-2.nix")
deployer.copy_from_host("${configFile "config-3-deployed"}", "/root/configuration-3.nix")
deployer.copy_from_host("${targetNetworkJSON}", "/root/target-network.json")
deployer.copy_from_host("${targetConfigJSON}", "/root/target-configuration.json")
@@ -181,12 +164,6 @@
target_hostname = deployer.succeed("ssh alice@target cat /etc/hostname").rstrip()
assert target_hostname == "config-2-deployed", f"{target_hostname=}"
with subtest("Deploy to bob@target with password based sudo"):
# TODO: investigate why --ask-sudo-password from nixos-rebuild-ng is not working here
deployer.succeed(r'${lib.optionalString withNg "NIX_SSHOPTS=-t "}passh -c 3 -C -p ${nodes.target.users.users.bob.password} -P "\[sudo\] password" nixos-rebuild switch -I nixos-config=/root/configuration-3.nix --target-host bob@target --sudo &>/dev/console')
target_hostname = deployer.succeed("ssh alice@target cat /etc/hostname").rstrip()
assert target_hostname == "config-3-deployed", f"{target_hostname=}"
with subtest("Deploy works with very long TMPDIR"):
tmp_dir = "/var/folder/veryveryveryveryverylongpathnamethatdoesnotworkwithcontrolpath"
deployer.succeed(f"mkdir -p {tmp_dir}")
@@ -11415,12 +11415,12 @@ final: prev: {
nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig";
version = "2025-12-11";
version = "2025-12-12";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "7af6f57d517d8cc68f249e0d27364c188a097812";
sha256 = "1mlb8778pv5s7hf4agzjf7cvpj7axn9pa6g3haddqgr6bpxiinli";
rev = "0044d0987ef7e624d04141d0f90d0481fd3c3663";
sha256 = "0rkz22y07l06f69kvrkin7flr4pzp71mn7px91rv5slp83i9d6n4";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
meta.hydraPlatforms = [ ];
@@ -13,6 +13,7 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
src = gemini-cli.overrideAttrs (oldAttrs: {
pname = "gemini-cli-vscode-ide-companion-vsix";
name = "${finalAttrs.pname}-${finalAttrs.version}.vsix";
installPhase = ''
runHook preInstall
@@ -23,14 +24,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
'';
});
unpackPhase = ''
runHook preUnpack
unzip $src
runHook postUnpack
'';
meta = {
description = "Enable Gemini CLI with direct access to your IDE workspace";
homepage = "https://github.com/google-gemini/gemini-cli";
@@ -2302,18 +2302,6 @@ let
};
};
influxdata.flux = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "influxdata";
name = "flux";
version = "1.0.5";
hash = "sha256-KIKROyfkosBS1Resgl+s3VENVg4ibaeIgKjermXESoA=";
};
meta = {
license = lib.licenses.mit;
};
};
intellsmi.comment-translate = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "intellsmi";
@@ -3415,8 +3403,8 @@ let
mktplcRef = {
name = "remote-containers";
publisher = "ms-vscode-remote";
version = "0.431.1";
hash = "sha256-4y3KvekPKwJl1h19bIzDHT+dB9++ewVaQQkTyYSoe68=";
version = "0.434.0";
hash = "sha256-XhD/5+YcYPD1b2lMsTfIVIU8wbCWrgP+2dgrt7mDV/I=";
};
meta = {
description = "Open any folder or repository inside a Docker container";
@@ -4913,7 +4901,7 @@ let
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
name = "${mktplcRef.publisher}-${mktplcRef.name}.vsix";
url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix";
sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6";
};
@@ -5545,6 +5533,7 @@ let
dendron.dendron-markdown-preview-enhanced = throw "dendron.dendron-markdown-preview-enhanced has been removed from the VSCode marketplace."; # Added 2025-08-21
equinusocio.vsc-material-theme = throw "'equinusocio.vsc-material-theme' has been removed due to security concerns. The extension contained potentially malicious code and was taken down."; # Added 2025-02-28
equinusocio.vsc-material-theme-icons = throw "'equinusocio.vsc-material-theme-icons' has been removed due to security concerns. The extension contained potentially malicious code and was taken down."; # Added 2025-02-28
influxdata.flux = throw "'influxdata.flux' has been removed due to being unmaintained upstream"; # Added 2025-12-09
jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29
jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29
matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29
@@ -11,7 +11,7 @@
let
vsix = stdenv.mkDerivation (finalAttrs: {
name = "gitlens-${finalAttrs.version}.zip";
name = "gitlens-${finalAttrs.version}.vsix";
pname = "gitlens-vsix";
version = "17.7.1";
@@ -60,14 +60,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
src = vsix;
unpackPhase = ''
runHook preUnpack
unzip $src
runHook postUnpack
'';
passthru = {
vsix = finalAttrs.src;
updateScript = nix-update-script {
@@ -12,7 +12,7 @@ in
{
url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}";
inherit sha256 hash;
# The `*.vsix` file is in the end a simple zip file. Change the extension
# so that existing `unzip` hooks takes care of the unpacking.
name = "${publisher}-${name}.zip";
# The `*.vsix` file is in the end a simple zip file. Force it using .vsix extension
# so that existing `unpackVsixSetupHook` hooks takes care of the unpacking.
name = "${publisher}-${name}.vsix";
}
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-7BHkRM9HcD5VDMCcAh2GFvGz+OSb7l/Ki3+V3v/RYSo=";
version = "0.14.4";
hash = "sha256-Y8yIAIT0TrrM8ZQSZl4QnVG6uE0F+AwWFvmhLe0ZPto=";
};
nativeBuildInputs = [
@@ -10,7 +10,7 @@
let
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
name = "roo-code-${finalAttrs.version}.zip";
name = "roo-code-${finalAttrs.version}.vsix";
pname = "roo-code-vsix";
version = "3.36.2";
@@ -32,6 +32,7 @@ let
vsix = buildNpmPackage {
inherit pname releaseTag;
name = "${pname}-${version}.vsix";
version = lib.trim (lib.readFile ./version.txt);
src = "${src}/editors/code";
npmDepsHash = "sha256-fV4Z3jj+v56A7wbIEYhVAPVuAMqMds5xSe3OetWAsbw=";
@@ -57,15 +58,14 @@ let
walk(del(.["$generated-start"]?) | del(.["$generated-end"]?))
' package.json | sponge package.json
mkdir -p $out
npx vsce package -o $out/${pname}.zip
npm exec --package=@vscode/vsce -- vsce package --out $out
'';
};
in
vscode-utils.buildVscodeExtension {
inherit version vsix pname;
src = "${vsix}/${pname}.zip";
src = vsix;
vscodeExtUniqueId = "${publisher}.${pname}";
vscodeExtPublisher = publisher;
vscodeExtName = pname;
@@ -0,0 +1,11 @@
unpackCmdHooks+=(_tryUnpackVsix)
_tryUnpackVsix() {
if ! [[ "$curSrc" =~ \.vsix$ ]]; then return 1; fi
# UTF-8 locale is needed for unzip on glibc to handle UTF-8 symbols:
# https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263
# Otherwise unzip unpacks escaped file names as if '-U' options was in effect.
#
# Pick en_US.UTF-8 as most possible to be present on glibc, musl and darwin.
LANG=en_US.UTF-8 @unzip@ -qq "$curSrc"
}
@@ -12,7 +12,7 @@
let
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
name = "vscode-icons-${finalAttrs.version}.zip";
name = "vscode-icons-${finalAttrs.version}.vsix";
pname = "vscode-icons-vsix";
version = "12.15.0";
@@ -6,10 +6,18 @@
fetchurl,
vscode,
unzip,
makeSetupHook,
writeScript,
jq,
vscode-extension-update-script,
}:
let
unpackVsixSetupHook = makeSetupHook {
name = "unpack-vsix-setup-hook";
substitutions = {
unzip = "${unzip}/bin/unzip";
};
} ./unpack-vsix-setup-hook.sh;
buildVscodeExtension = lib.extendMkDerivation {
constructDrv = stdenv.mkDerivation;
excludeDrvArgNames = [
@@ -63,7 +71,7 @@ let
# This cannot be removed, it is used by some extensions.
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
nativeBuildInputs = [ unpackVsixSetupHook ] ++ nativeBuildInputs;
installPhase =
args.installPhase or ''
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
version = "0-unstable-2025-12-02";
version = "0-unstable-2025-12-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
rev = "e58d3285f4323a19a0f5aea01f4cdf7a934e1155";
hash = "sha256-3n34FDDQ1CjmZ4V7Vl/JYi/24w9F3z1nLSEuq44KvMg=";
rev = "26cc26baf1357a581581ea5b3b6978391373d0a8";
hash = "sha256-J+EOHXdkPDYGgXgGJ4y4I6fRIv8lg4SqOCt14X6foTo=";
};
makefile = "Makefile";
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "helm-schema";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "losisin";
repo = "helm-values-schema-json";
tag = "v${finalAttrs.version}";
hash = "sha256-q5A+tCnuHTtUyejP4flID7XhsoBfWGge2jCgsL0uEOc=";
hash = "sha256-F4tfPZnvvagWEO25JOjtYPYDn+8k6sRH0k1UvHIQRzg=";
};
vendorHash = "sha256-xmj2i1WNI/9ItbxRk8mPIygjq83xuvNu6THyPqZsysY=";
vendorHash = "sha256-2HnbASIZqOPM9WOlZeEQKYbkBHXBjV0JaeKKYAAwQ3w=";
ldflags = [
"-s"
@@ -597,11 +597,11 @@
"vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
},
"hashicorp_kubernetes": {
"hash": "sha256-v68Tg6X+fM41dWAWY/b3RSRhzm7l7n25tKwDktFXxu0=",
"hash": "sha256-/piMr4HFTKyZdWPtS9B1NB4TK8v0jtn9PIjHuGRSmtM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
"rev": "v3.0.0",
"rev": "v3.0.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
},
@@ -1048,11 +1048,11 @@
"vendorHash": null
},
"oracle_oci": {
"hash": "sha256-PZ83SwGSgkQ8v+Hy56e8zipgbIR7Q/2rY27/5Zzwuok=",
"hash": "sha256-4EeI4mA5zNW3fmc2ESiaw/SOHoVw1cevtls+IFVVxfE=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v7.27.0",
"rev": "v7.28.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "aldente";
version = "1.36.1";
version = "1.36.2";
src = fetchurl {
url = "https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring/releases/download/${finalAttrs.version}/AlDente.dmg";
hash = "sha256-iouXZv6dfLGawWtDH+/wGOogDjUoqp55BE2ADAAos0o=";
hash = "sha256-VeNEONO7wachGgCFDybH4tGaz58xlTG10S/rvm/S/Tc=";
};
dontBuild = true;
+2 -2
View File
@@ -29,11 +29,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bind";
version = "9.20.15";
version = "9.20.16";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
hash = "sha256-1is4+uSLqD/KYYERLQxxAY2LDyzihdx53GoDZ3Isyrs=";
hash = "sha256-A//Mek/LfDm4KzS+G6K1n2wZG8eVxZNVMNXr5jCjUtY=";
};
outputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "clash-rs";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "Watfaq";
repo = "clash-rs";
tag = "v${finalAttrs.version}";
hash = "sha256-FFbRopIaAOpfb+Wbj+EUXRr89EQE108h8OMn+fpL+ew=";
hash = "sha256-MVj+GcSt0Q9bWLz7MpCIj9MtnHh/GRB3p+DapMPLxeY=";
};
cargoHash = "sha256-JYvITscH1K6xLE6XZpMrEFZWcbue7x7xuPxVQW/Vjb0=";
cargoHash = "sha256-Ikur9G6oSdKbK7gdZozBkplUjPfSjIABTVHjX7UPPvc=";
cargoPatches = [ ./Cargo.patch ];
@@ -0,0 +1,112 @@
{
"@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16",
"@esbuild/aix-ppc64@npm:0.25.9": "b5c49f119424bb3f7be30b652ef87bf881824ace02cc2327ba6f7e0f86d04d2afe2087086985f4220dfdbb816acb67e6dfcf00da9eb8b028babfac43df3adac8",
"@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d",
"@esbuild/android-arm64@npm:0.25.9": "afe76da072b16e355f546d1d9023b814ead0487d9fa5e393eeb4bb3f6f76e5542e14b82396ca37c38e868ed64deef6b25f1c47e2564141fe5ecfe0eb7543f3f8",
"@esbuild/android-arm@npm:0.15.18": "5547a5477fc9e2239fff37e7d41eec59473fb912a9d01a2ebfebec18ec820c9ce1a0445866fda06d7f285e8d0bcdde974ffb1affbca8cb2b5a2d8b952a424a4c",
"@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a",
"@esbuild/android-arm@npm:0.25.9": "0d4c724b84043db6597736865a4fe86640c88f21dc0ebe93a2298b4a0e0f0a5d1530a821dd1c18a2b39a6ca9abe8ff714b8ed5de496045a67150ea47c86a39d7",
"@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6",
"@esbuild/android-x64@npm:0.25.9": "9da8b1ede5670c2c9e644e0fedf1dd0747081272b296d3f80b53b44b637744d836efee00dc767b81940eb285524a5e3149d8045787f6281ee2bd53f61a9c8717",
"@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f",
"@esbuild/darwin-arm64@npm:0.25.9": "84a88a8f72fcc66381518d5821e4ed276aeea17c76559bee4fcb472b19456da630ad84d8d74b3e4c297ef7b1ec5bd5037d55ac6ef5c515a77fb94a1bd891dece",
"@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a",
"@esbuild/darwin-x64@npm:0.25.9": "c500bcd0c1a8f66d19cf575299a7da7f29dbdb56beac95bb6ddc570291e3e9da4e7d31db6453fc19ea5ac7f85662f40c9a3965c3e1f49657efeb292a6f601a26",
"@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654",
"@esbuild/freebsd-arm64@npm:0.25.9": "fb4951968ad62e5316ffd08c037bb2396e8119a0c2289e968421bb277bdbffe23d89c92dcd2d7eb680f31be2b05e36406211b141b9b89378b424e4b5193c3d7f",
"@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87",
"@esbuild/freebsd-x64@npm:0.25.9": "0c71856891d5cea255f9bcb4482c70347a39198da2769a273afbd16bc9db7176bc1d28c41dd569b8b8f98cfd14b10a728c79f54311037d702bb7dffd95f27740",
"@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c",
"@esbuild/linux-arm64@npm:0.25.9": "6c64bf50dfb709d4000b022558293764a20ff8ba0b6638e8abb3bd0806cab25ac971f1910eaf2a4d73f92080afdb296d57175b2199647de019c2f419365f839d",
"@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17",
"@esbuild/linux-arm@npm:0.25.9": "b9a473988dadbe98f1c6ade2597e5967371d929ac83bb9f888d726d4f0e5cc4b8fe5020332adb26d61748619bf3e62c831d9c80b3bf815a6dd90dab76283d533",
"@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5",
"@esbuild/linux-ia32@npm:0.25.9": "51f458a7038e2ee014b994f7f216821194b00716ae5abe78fe828d9cefd47575dc0ff703f95c18017e59b7bcb63c13ac6d551e8ab64522cce8af89bc33a689d6",
"@esbuild/linux-loong64@npm:0.15.18": "e35a9691366a29973d32207ddb1835ff9559404fa77d8fda95bf1d8c685ce45197af2273c0632d12e1139ab54fb4bc77d1d61c030efd95b4ff06334ef7219de0",
"@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296",
"@esbuild/linux-loong64@npm:0.25.9": "81478bff0f6d54e06fa96ec120c2dc92e47c3a1392397a121cf50a83496156f9abebd46f93e35a496f4f305c8af7cd430e4fe723474a2420cc21d39257852210",
"@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75",
"@esbuild/linux-mips64el@npm:0.25.9": "78709795d663461c54168719517c4c38b2a51861af0f97a91003ea6fe2c2b67dca77f57c2a2c4eb2c6481a8660b5fe477c72e46e90154cb72f1f235e683b2d0f",
"@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5",
"@esbuild/linux-ppc64@npm:0.25.9": "4a43e167f7f9659a5ca34678cb6fee53fbdba8b14a9a45f323abf33d9e141fd268984b0a18445db84cbada5ed2ac211ef318d5c44af0fbc0c7eea31c0c82321f",
"@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363",
"@esbuild/linux-riscv64@npm:0.25.9": "e71027660a884b5bbcb6e9e84ed439b3ef19466cd9f6d16c1bdfe2db6dbe9a40e8fc19ad429749102d1c15f015372f7f9f8ab7f82d506efffbd143fe8ab28aa9",
"@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae",
"@esbuild/linux-s390x@npm:0.25.9": "7004c5852a3cbd1bd1d727e13b2f2be0747861ceab840ab8492ddff80b3d34dd41398681016cda3748c697e1b384bf4d4c1ad588538df38eba599ba935ecbd09",
"@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674",
"@esbuild/linux-x64@npm:0.25.9": "3bab69aa63d5ef65e9eaa229963ee3a3c868a06badf019277af06d4f7c52ea3a30abafad361e5bcce71032abd8b6fb666607977a627fa2def8db6756cf99b2ee",
"@esbuild/netbsd-arm64@npm:0.25.9": "02b82c6773ad09082e3b18f01dbf4b9f72519a9e93995b479e4bd4bb28c8a4088972fd0e9304881d09775429dc388a3625249096426349dc3adc2208ee408a4a",
"@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1",
"@esbuild/netbsd-x64@npm:0.25.9": "51a576cb8ad7f43e43f76b25273735646eefa0d2a5bdaa3bd6387ab89512940bee49e91f7051b3d08d143d5cd6b4501f72a9462f30e242f0dff931c4ebe40363",
"@esbuild/openbsd-arm64@npm:0.25.9": "9bf0e7a535304f0d3c700d6e4ef536fe94b17e05bf5f9a4cc308ffc8c3d3cd642ee7debcf7f649a845610b1c706675af903f785ef14f320ee918faa61bf79bb5",
"@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85",
"@esbuild/openbsd-x64@npm:0.25.9": "bb9bb4c5f095575f267d30c9e65f8e64c3f425d24904f6e22112c305ee5f1503aea750f510252e4b862f366e5efac678b71cc848cda72c587be8af4119d28f80",
"@esbuild/openharmony-arm64@npm:0.25.9": "130f08d72a018aceef14b8534b9910bd2c0852fc074467ad0adf54d339584277326c7ffc8cd8126be08a530184c51d8de11d06971d1cc44545162bfb8428bcc3",
"@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a",
"@esbuild/sunos-x64@npm:0.25.9": "a86fca2baaaffcaed419bdc6569cf4a88b4ae830034f8deb4d83ba781b989e25b03696cfe05a482e24710191abc53479b70491f3f157eff37ed2b486d88c897b",
"@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366",
"@esbuild/win32-arm64@npm:0.25.9": "cd32c8fe88511e413f6161480ea3b6fc2ed7cb4bd2febb455e7bc45842880c752ba71772f289908ded50d8cfd3207e6730c8fdec2e811af1f65e97d1ee53b4ef",
"@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be",
"@esbuild/win32-ia32@npm:0.25.9": "c374576d857dfa3c8dc5bdeef598ffc0e3adfcb8b7986a2b78ce61d2aa3c3d1f1cd15cb685f52b88411403d974f657c3fd44cf9b4fadb94e8ed69d75e9e3e0ef",
"@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1",
"@esbuild/win32-x64@npm:0.25.9": "41f2ba9101f4a9a28e3287026a32a05e8fdffcb4a4e41cfaf9f94b41093c6882f46ef80f12854b67b7ad78e47d1df492f3e8a71d41813a61500ace4a574af851",
"@rollup/rollup-android-arm-eabi@npm:4.34.9": "6a78e363b2a00987ecce7d50d352be418acc0facce6a0ea07617c25a608414047426cb8edac1f112b2022c5d5ec37abb40fcc314b63db1313dbee50ef92ded39",
"@rollup/rollup-android-arm-eabi@npm:4.49.0": "52fb63fc3b966418047665d754210f7dd359cdbe53f74f1f94ac1b2cdd06ee45e0f7348d452864735465511c8bdd670670629ae6beb17a88991ad3dd700007f0",
"@rollup/rollup-android-arm64@npm:4.34.9": "1bab7d4cbf7f3b80d1624e722e0476195c83ccf84f5ae81b2297eef4900ca0e41b0b1612c2f82f3572d24d638964dc04f60e0616655c2de9552e78b5b0849ffd",
"@rollup/rollup-android-arm64@npm:4.49.0": "836b8568a1e67e2b4f4b06184a8b0cc8205e0747abca9a18ca74f1341929ddebcd3f7fcd62c4333e0a3b226fc7365570875c7027bdf043409b5647f4b2b6bb51",
"@rollup/rollup-darwin-arm64@npm:4.34.9": "d715c19d30eb8f56aa1c4292975b42fbcb03768191aec11c0bfb3c41c81ec27b2e267cca2a7eb710a782846a611b51f8ae325b01b6324fd609f18846f07165a1",
"@rollup/rollup-darwin-arm64@npm:4.49.0": "a5bb9703f8e777e5722a2e40be3de15672647a5df3aaf69d98d761c58e39c21bf521bbc5e138b20007381ebcf31cdc3acf6db5dcd519282b0f28b33d1202193c",
"@rollup/rollup-darwin-x64@npm:4.34.9": "e984bc5998e9e807c1dea42e00cd3a0a4e5eaf8969486a186b01c11f40216d49f08ece400d886d7099abbd89cc9669bc027c3ed9930b1f69bcbf8738e5c955e4",
"@rollup/rollup-darwin-x64@npm:4.49.0": "55403574f7375b2492137dee2b03747a4b13ef9e3711d11cf8af7d2a37c7e303d6c3b5f85f521fd4f60dbfd24e1cbd1a75c4b0f7a8a2caab2424e888656e8d59",
"@rollup/rollup-freebsd-arm64@npm:4.34.9": "b78b61e04d3e10612920850a53068c8255d21085aab1fdf77b51ed44276582c883e66bc0bba13e4e28cc79eb80e8aa5ed5afed5f55235877e6c0c20e60178dcf",
"@rollup/rollup-freebsd-arm64@npm:4.49.0": "eb24eae86218f5a8e96cf4a18a2c0060866bbd2ee82f00f4b68291f1226e08a71e09e7aaa1f741f9806d4b15c559eb46878a96c3367fd901e36795a63e514253",
"@rollup/rollup-freebsd-x64@npm:4.34.9": "a12b525e32fd88828415fa658e89e1a0038dbb5812b0351a594a03e0ed4dd5944aa427fabc21e17193d4e661d780902a38c32596dba01cec021183e424579659",
"@rollup/rollup-freebsd-x64@npm:4.49.0": "03cf0d678c8e8377ad97bc5a0fcf66ec91c8ef5781258d84935fc7740a4f66d51313cf912621e1e5ffec6bc394d9fc8092cdefdc8d745cc68947213ea58d6389",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.34.9": "fd327b38153fe56994002d14989853aa7e8eac316fa9f3c9584901ee34515fc91dd1ff84e3774e1654b417a9e2e83a304f68babc4ed500310a6bf66674cf0b56",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.49.0": "912ffb485aba2c2431dfe760c2f27c8dde1e1c96308df06e0b047c3966178dde09820815611e07ba388f94e77668d29650233ac540eac6e05c39ab4dcb6553c2",
"@rollup/rollup-linux-arm-musleabihf@npm:4.34.9": "3c249bf1151cc57a7b0d432bdcf8f37a5e33d61928fcc47271dde67e72385d0739ce74b2648e4e1df0bb804b958768f1d3a15321830f9fc1175d63bc619e0e6f",
"@rollup/rollup-linux-arm-musleabihf@npm:4.49.0": "3606da18b762e27627922ebc792fa2ca487b3181c8032cfae86751c3e82f57209fe4124388aa7edc7fb9e6378dd374602b1fa133b03b335438967b29c8bd626a",
"@rollup/rollup-linux-arm64-gnu@npm:4.34.9": "d12a76c6212f7b543cdc664dec96c3ed5c54a722ccaa964f5146050c0c8328b3728d7b6797f6b3cd249e5ceb803dc7ec5ff9c514e74d914e79c525540fb12805",
"@rollup/rollup-linux-arm64-gnu@npm:4.49.0": "763f607f123286327bc78e603c8a27e7d32606939e5835e45cc5004248ab6b1e4430c4147bb80f042ee20a3d9dad6c2d3d40848524a92a34e35a8dd299e7abbf",
"@rollup/rollup-linux-arm64-musl@npm:4.34.9": "42c76f063875dedfc0ec3ebcaf6c4988795affb4aee97d5d8dd5f8c3b8b48862a741d24cdc8baaede07a3bd6a32adaeb7c19301632b8db7a0530f48aeace4cc9",
"@rollup/rollup-linux-arm64-musl@npm:4.49.0": "eb9593462fb7735937a9e640efa71a903796d5bca4eadb18f2092863d1a00de84368630051d585934a29b05f157a81ead9c11112e5b7f1d1322cb4fa415865f8",
"@rollup/rollup-linux-loongarch64-gnu@npm:4.34.9": "4b7223f5c36e6ce1f002ed3e82039c69e0ac16a99f8b451a5842e7945035ca41e31344d7a63c747ce402779fea8d08a59d918b4341fd0de2d460f5875d6955c1",
"@rollup/rollup-linux-loongarch64-gnu@npm:4.49.0": "a49f30ed44abe792f029766148d55ccf6a361d444cf2627696b36bf589a98abc881b4780e4dd4baceb343a89936b0a6c5cce10015365d04c200b9f9816ea60a8",
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.9": "9183d3780b41c1c5e40bd4068f49aab70197454263c2dadac836da902473e84a710a810f83f60cc2d7b3dd4b888946786720b406a791ab67b6cdc0a3db742274",
"@rollup/rollup-linux-ppc64-gnu@npm:4.49.0": "fc8c43d848b4f327613e1bab73b27c777ca9773b5b63672268791750f40d78524a99ab0977500c650d74cfd519d64066effd50a7f9e28a67e2714706e98dcb53",
"@rollup/rollup-linux-riscv64-gnu@npm:4.34.9": "100bbb8457e560b9e02ae262c0e7d7b38b28de502bf9564835d369872121872df592654f425fa30f1f9e5c2477a2ca8617df223e7abeb0804ff961d660361bb4",
"@rollup/rollup-linux-riscv64-gnu@npm:4.49.0": "aadd1f82ff7adeda08d60486eee9262117a44d2aa29ff782dcee1be111d5196acf65625d02c87430203d1fc3cfe9bb505453952e24b072064898a6a6198517d7",
"@rollup/rollup-linux-riscv64-musl@npm:4.49.0": "aac7397ca667f881271cd862e7d02320a77bc317ed530952d0cb05f12d3ba743d33090119fc2dffc65d64cf345514b2938cd20289282abc0cfaebbad06dce318",
"@rollup/rollup-linux-s390x-gnu@npm:4.34.9": "9d45ec5abb16431dfc3e75a0beb96e9d05d508234c9583b9c958a026988fff8f751554ddf350f1ec472450524f821b6f4e0f8ac739c3be0462a4788d9432043d",
"@rollup/rollup-linux-s390x-gnu@npm:4.49.0": "57dd8e17277acc9b4f6424276ebc787d45cf4006189d5dac79e60dae0b0b20670c66fd489d137c31bde33ed31c8f874dce4f8d980d38b278c9bc1b234525df05",
"@rollup/rollup-linux-x64-gnu@npm:4.34.9": "514adaaf885a4a9e7b16c33bd15eb8c96e83f8d6cd5b975b88fc1d3d73dcf690459ddab317f46945875f03ed9869cdbb5b698d23b2c0425af1f6ca6d09e42e0e",
"@rollup/rollup-linux-x64-gnu@npm:4.49.0": "cbb135fd448a945e638bd056c6c89f1a202ae8b0e636557c6cce21c85c8135d8411cf4a5621f3203a87037ebef9d7c8367d7af4c9043085368bcbc80c413658e",
"@rollup/rollup-linux-x64-musl@npm:4.34.9": "ae6df03b8326146373ce166701dcf82398371402e84934d8a343187bde2ad53afb5ac565d7466c2b65a90215b2f4e4c06a05fec1c8cfd679efa2816587da4ca8",
"@rollup/rollup-linux-x64-musl@npm:4.49.0": "fcb0028c3e1c992eea5c7a7a41aaccb840a9e4383fc97cef92fadc7d2615e7c15a33bacafbae06fd9cc93093467024e0cc2f36b07e29845dbcdafe22d171a426",
"@rollup/rollup-win32-arm64-msvc@npm:4.34.9": "d2c1fd1d75fe8507f1c921d4cb777e72851b39675b1ac2571f29ff24b4512e57f6142fcd910faa54b14028e3140acf7b4464b80128eaf90db977830ac11506c9",
"@rollup/rollup-win32-arm64-msvc@npm:4.49.0": "2712adce89bc28070ff18ff0e85cf36cb4aba96c499ee2fa625a3fc36e0187128f7d924e305657ef9d2630f4dabcf36fdfd5d5a2a5563ee9afb2d75495915618",
"@rollup/rollup-win32-ia32-msvc@npm:4.34.9": "14e4450adba80fcf5a913a9eeb2687f65054816f232bed169bab828000ba745edf9bc9d57975c656924c30ef7b2368a6970e96f17da5d8d9c932193dbda702b2",
"@rollup/rollup-win32-ia32-msvc@npm:4.49.0": "ccbf8b8014c713ae772739a1279ff78ce9296f78b98612d0a200a3bb280718c24e3eef592597ff59c5c7e5fa4d8fdc1969d9e2fae54fbff1754541ce353a6fb7",
"@rollup/rollup-win32-x64-msvc@npm:4.34.9": "6ecd0dcfbee51dd2cbf7a9f1a97c8db411874003f88846423df2b73a225b0cb3d5272ac3c32473aa2e7981f5001e05ac9320b57d5f44c18fabec09ee7839a95c",
"@rollup/rollup-win32-x64-msvc@npm:4.49.0": "6a611fea13c4a5a4c63162ab78a025ce7ef949fb36d884d4ee88c88cc414bf64b6a75d702bf2301c906f7661a77c912677c1b5aeffbb0240a3ed67f50862cd39",
"esbuild-android-64@npm:0.15.18": "f5fc62d6a7181542425ec792f68ae4f456e7a4addae1f10cdd84b370b8636f0af126edda898b0b491135f4363bdabc08fbfa3444082a0c15fbcebccc7b8f8c5c",
"esbuild-android-arm64@npm:0.15.18": "a7f8c9e0547ea4aa046f14e102373a6e595ff99fd76113012504fcf218cbcf23ed36c8b64cdf59db68028107090b02873acdf77ec1bbe15749124fa2c8a5fed8",
"esbuild-darwin-64@npm:0.15.18": "517259f5a498085b42f8d3e59fd3b6bf4802b947f771bb353b26e5170a2133cd2d0aa803ea1db1a31552fb83cf6740fd30ccc8e2409a8fb067f2d3fe7191c796",
"esbuild-darwin-arm64@npm:0.15.18": "d45d707a5ae873b3f80493154d5f6b95da8c1f67ead57fccbaa9a2618502a00cb4d7d40a5f872ccc8ca63d2f69e3d4180cd6e620861a25bd8acd16cfb2e83427",
"esbuild-freebsd-64@npm:0.15.18": "5d9ac31f4e3b6d6f307aef8a036bee3980394d4d2d6635a5a284f1700c662c57df79647e3ca1d9132d3313bbeffd97a1b292ca491d2e7c7b8e90525f06178c0c",
"esbuild-freebsd-arm64@npm:0.15.18": "a69cb6d3b7b4b4bbd35631c971fee72dea76cfb57ed5e437a6b45134efbd41eafdad469c8333306a282753926c0e75a32e576b91421ffab9206c2bb852fe42da",
"esbuild-linux-32@npm:0.15.18": "7e62aba6dbb45eaa85870c7254906903fa581e0fccd68b3b722107e7f7093925920bd5e67ebd768ba923e760ee4b0e59ecf6e4cbde55428ebd3adc2469575889",
"esbuild-linux-64@npm:0.15.18": "04cf5274291fe54b7574731bd0b580973b592a5ba97cfca504fc91f554a8b85ed81ce11d199a7d961a360b4290775d6ac6b88ab08fa277b3dee3777cd5e2bb31",
"esbuild-linux-arm64@npm:0.15.18": "979045586d3374a368cb7b52518730d6f3e9d75a401f9c66bc9e4086b92886e9d5df780a3aaee964b4bb1c636a4e79a25ca561e8faec681d6020f1fcfb6d2540",
"esbuild-linux-arm@npm:0.15.18": "b44ba7dbecace5fa1d1ebe56580b71a6d247b51b2dabb213001fc5badf8742ac51e61f7467b9fde3e28c19a103e94f4b32b5f6a1eba0a799d6cd074623344107",
"esbuild-linux-mips64le@npm:0.15.18": "c0d4f17988428eb0e4fe6da8370611a2949c0349f10f0b6e2b09c6c4906833b8246ca8d1f2296e84136efbe1e9640305baac9b9c436234edbce2f4178839070d",
"esbuild-linux-ppc64le@npm:0.15.18": "76c3efe91f3300cd18ffc34503e1c03dd0fd7c9e4065a4db2de3461d720dd94653c111e691b6a1f6a183e7400bc6db6aadf9d6eec5f7d7fae5d9e5094e6a5cdf",
"esbuild-linux-riscv64@npm:0.15.18": "bd124d28ac4863a973abef6e2b48f5522a0ecab7c15418df97e88624d15f8f150be9eee1771ee160fe3bcd676f80f9dc413afef6ec0bb9dcd5056bbf0ef2abd7",
"esbuild-linux-s390x@npm:0.15.18": "94cc286975696f24fb196287e6cc18a21d09fe80c36787022054152ad7460e4704627bb2f7f5c338f80254eee881ae197ac74f249d762c7132f879701db59824",
"esbuild-netbsd-64@npm:0.15.18": "f7e431e02fb049f03a1b8ad3ebdc8bac78b4c9ed1cf3547588a57158b75abd584914eb6b28d75cfd885278d5e77efe35f71da4df26fe904cc54a53faf836c79a",
"esbuild-openbsd-64@npm:0.15.18": "ce3405759130951112dc6a78b307e2bf9ea01459cadd61ccb10f009ba5583923304a9f6905084867f1f2de89042876066a687f587d071f10f136b25f208f7d6d",
"esbuild-sunos-64@npm:0.15.18": "b1966d6ccb77b131d4cbfac2dfdadb7ce75228a1d90125c509bfba6d5bdbd3f3e1b559d83aca270207645cd2e20e22a6e3a8b05b5a28fa0b41a452df3c99c297",
"esbuild-windows-32@npm:0.15.18": "c8dc9b19b995b388fa5febe5fa8c83e10dfaeaae0ce6d3d0f213132a7c6f6160efa2cc194b6951b9d7c3996f07f6db541f6792d0f98fb9a505dbf065eb93a27c",
"esbuild-windows-64@npm:0.15.18": "5efe076a7148bbe50daadc26221099631a9ea561fb0a057705182042d1c87ce7921dc4ec98f851f35c2b099c73ad5fa7e395d87216890cdb10528966ac7c9268",
"esbuild-windows-arm64@npm:0.15.18": "84200ee2ef8fbeac72e1c31609819ea38da3979ba3499e1d153ff9e44048b14f91839e0f486cea643051d16d39e885045874fc1041e4d176ce414593c73aaa50"
}
+176
View File
@@ -0,0 +1,176 @@
{
acl,
bash,
coreutils,
fetchFromGitHub,
firewalld,
getent,
glibc,
iproute2,
jq,
lib,
lsscsi,
makeWrapper,
mbuffer,
msmtp,
nodejs,
openssh,
python312,
samba,
shadow,
smartmontools,
stdenv,
su,
systemd,
util-linux,
yarn-berry,
zfs,
}:
let
# Using python312 because py-libzfs is not compatible with newer versions
python = (
python312.withPackages (ps: [
ps.pyudev
ps.py-libzfs
])
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "cockpit-zfs";
version = "1.2.12-2";
src = fetchFromGitHub {
owner = "45Drives";
repo = "cockpit-zfs";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-oeXSOxogfAazRsKfngq2+DOyo//wRJQSqm7gaCza4WY=";
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-YnR1SqBGnxEQaGUGMNTHHEGcOIhuGbWnqMdr4eRGXcA=";
};
nativeBuildInputs = [
makeWrapper
nodejs
jq
yarn-berry
yarn-berry.yarnBerryConfigHook
];
passthru.cockpitPath = [
acl
bash
coreutils
firewalld
getent
glibc
iproute2
lsscsi
mbuffer
msmtp
nodejs
openssh
python
samba
shadow
smartmontools
su
systemd
util-linux
zfs
];
env = {
# Disable post-install scripts that try to access network (electron, plantuml-pipe)
YARN_ENABLE_SCRIPTS = "0";
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
};
patchPhase =
let
# houston-common-lib has @types/electron which pulls in electron.
# Electron's postinstall downloads binaries, which fails in sandbox.
# Since this is a Cockpit plugin (not an Electron app), we don't need electron.
houstonLibDir = "houston-common/houston-common-lib";
houstonUiDir = "houston-common/houston-common-ui";
in
''
runHook prePatch
# Remove electron type dependency
substituteInPlace ${houstonLibDir}/package.json \
--replace-fail '"@types/electron": "^1.6.12",' ""
substituteInPlace ${houstonLibDir}/tsconfig.json \
--replace-fail '"types": ["electron"]' '"types": []'
# Skip TypeScript type checking (fails without electron types)
substituteInPlace ${houstonLibDir}/package.json \
--replace-fail '"build": "tsc --noEmit && vite build"' '"build": "vite build"'
substituteInPlace ${houstonUiDir}/package.json \
--replace-fail '"build": "run-p type-check \"build-only {@}\" --"' '"build": "vite build"'
# Externalize vue and electron in houston-common-lib (peer dependencies)
substituteInPlace ${houstonLibDir}/vite.config.ts \
--replace-fail 'external: (id) => {' 'external: (id) => {
if (id === "vue" || id.startsWith("vue/") || id === "electron" || id.startsWith("electron/")) return true;'
# Disable VueDevTools and dts plugins (fail with Yarn PnP)
substituteInPlace ${houstonUiDir}/vite.config.ts \
--replace-fail "import VueDevTools from 'vite-plugin-vue-devtools'" "" \
--replace-fail "VueDevTools()," "" \
--replace-fail "import dts from 'vite-plugin-dts'" ""
sed -i '/dts({/,/})/d' ${houstonUiDir}/vite.config.ts
runHook postPatch
'';
buildPhase = ''
runHook preBuild
yarn workspaces foreach -Rpt --from 'cockpit-zfs' run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/cockpit/zfs
cp -r zfs/dist/* $out/share/cockpit/zfs/
if [ -d system_files ]; then
cp -r system_files/* $out/
fi
for script in $out/etc/zfs/zed.d/*; do
if [ -f "$script" ]; then
wrapProgram "$script" \
--set PATH "${
lib.makeBinPath [
coreutils
bash
python
jq
]
}"
fi
done
runHook postInstall
'';
meta = {
description = "Cockpit plugin for ZFS management by 45Drives";
homepage = "https://github.com/45Drives/cockpit-zfs";
changelog = "https://github.com/45Drives/cockpit-zfs/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.eymeric ];
};
})
+4 -2
View File
@@ -36,6 +36,7 @@
sscg,
systemd,
udev,
util-linux,
xmlto,
# Enables lightweight NixOS branding, replacing the default Cockpit icons
withBranding ? true,
@@ -167,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [
"--enable-prefix-only=yes"
"--disable-pcp" # TODO: figure out how to package its dependency
"--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin"
"--with-default-session-path=${placeholder "out"}/bin:/etc/cockpit/bin:${util-linux}/bin:/run/wrappers/bin:/run/current-system/sw/bin"
"--with-admin-group=root" # TODO: really? Maybe "wheel"?
];
@@ -191,7 +192,8 @@ stdenv.mkDerivation (finalAttrs: {
for binary in $out/bin/cockpit-bridge $out/libexec/cockpit-askpass; do
chmod +x $binary
wrapProgram $binary \
--prefix PYTHONPATH : $out/${python3Packages.python.sitePackages}
--prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} \
--prefix XDG_DATA_DIRS : /etc/cockpit/share # Cockpit apps will be stored at /etc/cockpit/share/cockpit/ (managed by Cockpit nixos service)
done
patchShebangs $out/share/cockpit/issue/update-issue
+2 -2
View File
@@ -13,11 +13,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "copybara";
version = "20251201";
version = "20251208";
src = fetchurl {
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
hash = "sha256-dZXneydnQsjQUmcOpKQiWcQWid7doUrMWE4TRyX2C50=";
hash = "sha256-zTQOjF3ATvbG3zIPyML3FZRqqvWj7gMZimRKu7V7ETE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "dns-collector";
version = "1.13.0";
version = "1.14.0";
src = fetchFromGitHub {
owner = "dmachard";
repo = "dns-collector";
tag = "v${finalAttrs.version}";
hash = "sha256-oip7rMCcWppUwCPy6VG/kJsNWf1EZZmf0iTj8FSvHeE=";
hash = "sha256-J6h/td5vCZwVruamZziIxRhAOdLdlv3Aupz9m0bExU4=";
};
subPackages = [ "." ];
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
];
vendorHash = "sha256-1gFsLsPrsJhZ6V3/H22ZjIHrG1hTsRCj/Ur3gC01NSE=";
vendorHash = "sha256-BQLlEY9CJDwJRbzB5kflBwwxcWMLbaqgWUtz2p3CJsE=";
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -18,14 +18,14 @@
python3Packages.buildPythonApplication rec {
pname = "faugus-launcher";
version = "1.11.1";
version = "1.11.3";
pyproject = false;
src = fetchFromGitHub {
owner = "Faugus";
repo = "faugus-launcher";
tag = version;
hash = "sha256-FBsk7JfsXRTNFd6htMCNYFurvQtw42k8OIEj+vRyQqU=";
hash = "sha256-lmQctCjWKBdEtALIdasQ6M3KwB89mmwier8VqecnmzE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildNpmPackage rec {
pname = "firebase-tools";
version = "14.27.0";
version = "15.0.0";
src = fetchFromGitHub {
owner = "firebase";
repo = "firebase-tools";
tag = "v${version}";
hash = "sha256-mkHZtC3W8ueB0cB4fVSAY5DID2QEdv+2ZmkhsVTunEc=";
hash = "sha256-5bxcocw20zzjEh5kGLEUMW/xuAaAvX1goYP5JesFfm0=";
};
npmDepsHash = "sha256-XDaFdYbowygMiM0BX1ggfWt1JXHaLOaZ2Npztip7CAU=";
npmDepsHash = "sha256-a46vqu39pVKpu1kpP7+EiYUg2DK/fHTWTX+qZ1j+744=";
# No more package-lock.json in upstream src
postPatch = ''
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "github-copilot-cli";
version = "0.0.367";
version = "0.0.369";
src = fetchzip {
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
hash = "sha256-RkJLklYZx1xWuRpxbZQDLPvRbfSbI6JhBZAswfyN+zk=";
hash = "sha256-6PBJf7LMUYrl3kIgR1rYkxLk19H7VjnIPVPOMq6Fwoc=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitlogue";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "unhappychoice";
repo = "gitlogue";
tag = "v${finalAttrs.version}";
hash = "sha256-OKRgtWa1HbUgczuS0EdMgosuKPaZJhzIfjwKZAAaBCs=";
hash = "sha256-tcq0TIB9Mfm3kt2PInMto7g2VNpDsOvBiQGNP8+nFvY=";
};
cargoHash = "sha256-cq1bjOxuGJDRLoO0p5tmGF4IjUojXF52p/n6mugPdPg=";
cargoHash = "sha256-RZ+JiMy0zHu8aEn4ytRmFcvASRcsHDVK9ls77W7ann0=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "goverlay";
version = "1.6.1";
version = "1.6.2";
src = fetchFromGitHub {
owner = "benjamimgois";
repo = "goverlay";
tag = finalAttrs.version;
hash = "sha256-uJdX0Q8SO16U4AuDZWGeEFwVW0m8c4gNeAntWSWLvoU=";
hash = "sha256-x9/M2yhnPaXIGrQqZRvhgB++TyxHD3sFkK+6H5v+jqE=";
};
outputs = [
+2 -2
View File
@@ -29,14 +29,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpu-viewer";
version = "3.22";
version = "3.23";
pyproject = false;
src = fetchFromGitHub {
owner = "arunsivaramanneo";
repo = "gpu-viewer";
tag = "v${version}";
hash = "sha256-3X2dGjxxZdtNCvrCjoJ0hHzOS/3PZIn1oJAHu+j7Lu4=";
hash = "sha256-+x+e/GCNBpZTpExVwY6gm+/20pU5dg34+qMQIDWEf0E=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -19,13 +19,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "grimblast";
version = "0.1-unstable-2025-12-01";
version = "0.1-unstable-2025-12-07";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "contrib";
rev = "e88d93f8aed2b9631b62ca273590fd3528310d7e";
hash = "sha256-71vBBU9GC+A+tdqAuFDRdx8WEVuj4OaVY5apoaAALkc=";
rev = "db18f83bebbc2cf43a21dbb26cd99aabe672d923";
hash = "sha256-b8YOwGDFprkQJjXsKGuSNS1pWe8w4cUW36YxlUelNpU=";
};
strictDeps = true;
+2 -2
View File
@@ -1,7 +1,7 @@
{ callPackage, ... }:
callPackage ./generic.nix {
version = "5.2.13";
version = "5.2.14";
kde-channel = "stable";
hash = "sha256-y5CUMMmeK/EGhPHBPXaHZpHuYlctmqpU1wWJMflhVTE=";
hash = "sha256-VWkAcmwv8U5g97rB6OkVAQDyzZJmnKXcdKxYUe+sKIc=";
}
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
version = "1.27.1";
version = "1.28.0";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
hash = "sha256-iEia3g3nxnVm4q5lpV9SFOSKgHJsZ7jdqE73vA2bPpI=";
hash = "sha256-uIIy4zSf6ply859aHVvlujqBWpN18FLZh+Vye3fbSoY=";
};
vendorHash = "sha256-nbUaSTmhAViwkguMsgIp3lh2JVe7ZTwBTM7oE1aIulk=";
vendorHash = "sha256-Hl7cYZbs+rDS2+1ojgCUhLfBVGQ+ZhAApRczkUYOwVY=";
subPackages = [ "cmd/kubectl-cnpg" ];
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "msolve";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "algebraic-solving";
repo = "msolve";
tag = "v${finalAttrs.version}";
hash = "sha256-N/ePJGbF3pGU+IiyztkKujpfFRLy7FSIkpUltv6iJXY=";
hash = "sha256-wlZLmX4a3QjBWraM3DS++YaO1FSzMbvi2wWgrxnwm8U=";
};
postPatch = ''
+4 -34
View File
@@ -9,20 +9,15 @@
python3Packages,
runCommand,
scdoc,
withNgSuffix ? true,
withReexec ? false,
withShellFiles ? true,
# Very long tmp dirs lead to "too long for Unix domain socket"
# SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
withTmpdir ? if stdenv.hostPlatform.isDarwin then "/tmp" else null,
# passthru.tests
nixosTests,
nixVersions,
lixPackageSets,
nixos-rebuild-ng,
}:
let
executable = if withNgSuffix then "nixos-rebuild-ng" else "nixos-rebuild";
executable = "nixos-rebuild";
in
python3Packages.buildPythonApplication rec {
pname = "nixos-rebuild-ng";
@@ -55,11 +50,7 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
substituteInPlace nixos_rebuild/constants.py \
--subst-var-by executable ${executable} \
--subst-var-by withReexec ${lib.boolToString withReexec} \
--subst-var-by withShellFiles ${lib.boolToString withShellFiles}
substituteInPlace pyproject.toml \
--replace-fail nixos-rebuild ${executable}
'';
postInstall = lib.optionalString withShellFiles ''
@@ -103,32 +94,11 @@ python3Packages.buildPythonApplication rec {
};
tests = {
with_reexec = nixos-rebuild-ng.override {
withReexec = true;
withNgSuffix = false;
};
with_nix_latest = nixos-rebuild-ng.override {
nix = nixVersions.latest;
};
with_nix_stable = nixos-rebuild-ng.override {
nix = nixVersions.stable;
};
with_nix_2_28 = nixos-rebuild-ng.override {
# oldest supported version in nixpkgs
nix = nixVersions.nix_2_28;
};
with_lix_latest = nixos-rebuild-ng.override {
nix = lixPackageSets.latest.lix;
};
with_lix_stable = nixos-rebuild-ng.override {
nix = lixPackageSets.stable.lix;
};
inherit (nixosTests)
# FIXME: this test is disabled since it times out in @ofborg
# nixos-rebuild-install-bootloader-ng
nixos-rebuild-specialisations-ng
nixos-rebuild-target-host-ng
# nixos-rebuild-install-bootloader
nixos-rebuild-specialisations
nixos-rebuild-target-host
;
repl = callPackage ./tests/repl.nix { };
# NOTE: this is a passthru test rather than a build-time test because we
@@ -5,7 +5,7 @@ from subprocess import CalledProcessError, run
from typing import Final, assert_never
from . import nix, services
from .constants import EXECUTABLE, WITH_REEXEC, WITH_SHELL_FILES
from .constants import EXECUTABLE, WITH_SHELL_FILES
from .models import Action, BuildAttr, Flake, GroupedNixArgs, Profile
from .process import Remote
from .utils import LogFormatter
@@ -288,7 +288,7 @@ def execute(argv: list[str]) -> None:
# Re-exec to a newer version of the script before building to ensure we get
# the latest fixes
if WITH_REEXEC and can_run and not args.no_reexec:
if can_run and not args.no_reexec:
services.reexec(argv, args, grouped_nix_args)
profile = Profile.from_arg(args.profile_name)
@@ -7,5 +7,4 @@ from typing import Final
EXECUTABLE: Final[str] = "@executable@"
# Use either `== "true"` if the default (e.g.: `python -m nixos_rebuild`) is
# `False` or `!= "false"` if the default is `True`
WITH_REEXEC: Final[bool] = "@withReexec@" == "true"
WITH_SHELL_FILES: Final[bool] = "@withShellFiles@" == "true"
@@ -7,6 +7,7 @@ import shlex
import subprocess
from collections.abc import Sequence
from dataclasses import dataclass
from ipaddress import AddressValueError, IPv6Address
from typing import Final, Self, TypedDict, Unpack
from . import tmpdir
@@ -63,6 +64,23 @@ class Remote:
"'--ask-sudo-password' option instead"
)
def ssh_host(self) -> str:
"""Fix up host string for SSH.
It returns an SSH-compatible host string if the host is using an
IPv6 address, otherwise it returns the passed host string unmodified.
"""
try:
host_split = self.host.split("@")
host_fixed = host_split[-1].strip("[]").replace("%25", "%")
IPv6Address(host_fixed)
if len(host_split) > 1:
return host_split[0] + "@" + host_fixed
else:
return host_fixed
except AddressValueError:
return self.host
# Not exhaustive, but we can always extend it later.
class RunKwargs(TypedDict, total=False):
@@ -112,7 +130,7 @@ def run_wrapper(
"ssh",
*remote.opts,
*SSH_DEFAULT_OPTS,
remote.host,
remote.ssh_host(),
"--",
# SSH will join the parameters here and pass it to the shell, so we
# need to quote it to avoid issues.
@@ -187,7 +205,7 @@ def _kill_long_running_ssh_process(args: Args, remote: Remote) -> None:
"ssh",
*remote.opts,
*SSH_DEFAULT_OPTS,
remote.host,
remote.ssh_host(),
"--",
"pkill",
"--signal",
@@ -140,3 +140,23 @@ def test_remote_from_name(monkeypatch: MonkeyPatch) -> None:
opts=["-f", "foo", "-b", "bar", "-t"],
sudo_password="password",
)
def test_ssh_host() -> None:
remotes = {
"user@[fe80::1%25eth0]": "user@fe80::1%eth0",
"[fe80::c98b%25enp4s0]": "fe80::c98b%enp4s0",
"user@[2001::5fce:a:198]": "user@2001::5fce:a:198",
"[2001::dead:beef]": "2001::dead:beef",
"root@192.168.178.1": "root@192.168.178.1",
"192.168.178.1": "192.168.178.1",
"user@localhost": "user@localhost",
"localhost": "localhost",
"user@example.org": "user@example.org",
"example.org": "example.org",
}
for host_input, expected in remotes.items():
remote = m.Remote.from_arg(host_input, None, False)
assert remote is not None
assert remote.ssh_host() == expected
@@ -37,7 +37,7 @@ runCommand "test-nixos-rebuild-repl"
nativeBuildInputs = [
expect
nix
(nixos-rebuild-ng.override { withNgSuffix = false; })
nixos-rebuild-ng
];
nixpkgs = if builtins.pathExists (path + "/.git") then lib.cleanSource path else path;
+3 -3
View File
@@ -13,12 +13,12 @@
}:
let
pname = "opencode";
version = "1.0.138";
version = "1.0.150";
src = fetchFromGitHub {
owner = "sst";
repo = "opencode";
tag = "v${version}";
hash = "sha256-PdxkJXG+GYVpzChhUdgSUejrCg6yGY1R29BQfvByxYo=";
hash = "sha256-8mFmFFk378g93MbFRwMOJkjuXqq3PVPdCuGVLPn6D44=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -70,7 +70,7 @@ let
# NOTE: Required else we get errors that our fixed-output derivation references store paths
dontFixup = true;
outputHash = "sha256-j3K0cSBQaOhjHQcfodxGV1FV35zhpELFE56TK/6uS5s=";
outputHash = "sha256-3swARfDhEfLoaucjiUfse3px40ZBfQsEE8DPgUk/5K0=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
+17 -9
View File
@@ -4,9 +4,10 @@
buildGoModule,
fetchFromGitHub,
makeWrapper,
coreutils,
runCommand,
runtimeShell,
versionCheckHook,
writableTmpDirAsHomeHook,
writeText,
terraform-providers,
installShellFiles,
@@ -15,16 +16,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.10.8";
version = "1.11.1";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
tag = "v${version}";
hash = "sha256-3Sl34tPRA2BF59bouPkuS/CiYcZfRivD+PozTT+srT0=";
hash = "sha256-2mtSRszdHeHDKpIu+w/Y/P8NfoSPzPBkgQ9YgKSwrls=";
};
vendorHash = "sha256-rOSl5WE1/WcgCVpcAOXVl8cBSxjrlG7fxzpRO/5i5GA=";
vendorHash = "sha256-aPBP7mZ4NuPAYAOW20cQ6bWQUqk9mfiaeFUS/RQyW4I=";
ldflags = [
"-s"
"-w"
@@ -32,10 +33,8 @@ let
"github.com/opentofu/opentofu/version.dev=no"
];
postConfigure = ''
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
--replace-fail "/bin/stty" "${coreutils}/bin/stty"
postPatch = ''
substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4'
'';
nativeBuildInputs = [ installShellFiles ];
@@ -53,8 +52,17 @@ let
installShellCompletion --bash --name tofu <(echo complete -C tofu tofu)
'';
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [
writableTmpDirAsHomeHook
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = "version";
preCheck = ''
export HOME=$TMPDIR
export TF_SKIP_REMOTE_TESTS=1
'';
+2 -11
View File
@@ -3,27 +3,18 @@
stdenv,
nix-update-script,
fetchFromGitHub,
fetchpatch2,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "oscar64";
version = "1.32.265";
version = "1.32.266";
src = fetchFromGitHub {
owner = "drmortalwombat";
repo = "oscar64";
tag = "v${finalAttrs.version}";
hash = "sha256-nPwebydRFHoIWp2sbfPaudKj/sPZRKamYdIuSVZ9dcc=";
hash = "sha256-udbVRdGIGv3jgeh1cKp7MhSDxNs56FlqEbpzgfWcieE=";
};
patches = [
(fetchpatch2 {
name = "fix-make-install.patch";
url = "https://github.com/drmortalwombat/oscar64/commit/af9e06a467be07422bc87058bebdef79e0a94ea1.patch?full_index=1";
hash = "sha256-YsbdYi+dwLQSGOT8krJsFqJxS0EpIiQqavQpH0nl7S0=";
})
];
postPatch = ''
substituteInPlace ./oscar64.1 \
--replace-fail "/usr/local/bin/oscar64" "$out/bin/oscar64" \
+2 -2
View File
@@ -17,7 +17,7 @@
buildGoModule rec {
pname = "rclone";
version = "1.72.0";
version = "1.72.1";
outputs = [
"out"
@@ -28,7 +28,7 @@ buildGoModule rec {
owner = "rclone";
repo = "rclone";
tag = "v${version}";
hash = "sha256-zZFjGkxQLkYNYpSRrVVsLFK6CvpVSJEvLn6FDdufxqA=";
hash = "sha256-CyMGcyFkYbKYvv2pc2M1K6ikAI0tPO/Tc1DEf0O/Fsw=";
};
vendorHash = "sha256-tNeL43WGWeX88vXJwQzxubUPIyejl3PPHXLc8oNeno4=";
+34
View File
@@ -0,0 +1,34 @@
{
lib,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rod";
version = "0.1.13";
src = fetchFromGitHub {
owner = "leiserfg";
repo = "rod";
tag = finalAttrs.version;
hash = "sha256-LwksGhz55CVY6D0IqNHA9OYNB6261xWxwxXxlYN5NQA=";
};
cargoHash = "sha256-vpZOS8PY9fSOVeMGQf8uYZtpUnc3D6a+ZenLmBCfPFg=";
passthru.updateScript = nix-update-script { };
meta = {
description = "Tool for detecting the lightness of the terminal background";
homepage = "https://github.com/leiserfg/rod";
changelog = "https://github.com/leiserfg/rod/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
leiserfg
nekowinston
];
platforms = lib.platforms.unix;
};
})
+3 -3
View File
@@ -16,18 +16,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruff";
version = "0.14.8";
version = "0.14.9";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
tag = finalAttrs.version;
hash = "sha256-jL3zQS2F9pxsWolNKgw8Tn53DHragGwonNmNV8t8h80=";
hash = "sha256-2EuI11mdwxKry7d56Ua7ZEU7K0XMgIVHm1zSVoWLkzM=";
};
cargoBuildFlags = [ "--package=ruff" ];
cargoHash = "sha256-GEf/gU2DXz+u7kPHAB1NRqkmn0f7NV3M5U9u17adtkI=";
cargoHash = "sha256-db45h6I5tCcPMbPGa/dV3eJ9CxCwnGShmHdg92AUhv0=";
nativeBuildInputs = [ installShellFiles ];
+5 -4
View File
@@ -9,24 +9,25 @@
rustPlatform.buildRustPackage rec {
pname = "rust-parallel";
version = "1.18.1";
version = "1.20.0";
src = fetchFromGitHub {
owner = "aaronriekenberg";
repo = "rust-parallel";
rev = "v${version}";
hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0=";
hash = "sha256-osuuEYOktSMmpKURXvn0rWUeBgFV07aTeM8oxkiCe10=";
};
cargoHash = "sha256-wJtXYx2mncOnnUep4CMFt+1mK1vMyhYFCQM/2B9m6zY=";
cargoHash = "sha256-20Lr7nRhr7Vrkk31iCioxmYpXYOfQFAmPkyHe1Nfijc=";
postPatch = ''
substituteInPlace tests/dummy_shell.sh \
--replace "/bin/bash" "${bash}/bin/bash"
--replace-fail "/bin/bash" "${bash}/bin/bash"
'';
checkFlags = [
"--skip=runs_echo_commands_dry_run"
"--skip=test_keep_order_with_sleep"
"--skip=runs_regex_command_with_dollar_signs"
"--skip=runs_regex_from_command_line_args_nomatch_1"
+2 -7
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "scdoc";
version = "1.11.3";
version = "1.11.4";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "scdoc";
rev = finalAttrs.version;
hash = "sha256-MbLDhLn/JY6OcdOz9/mIPAQRp5TZ6IKuQ/FQ/R3wjGc=";
hash = "sha256-gldCHzLigeLKDFDcE3TYrNOEWoSt/uYIg9aTg6wwW54=";
};
outputs = [
@@ -22,11 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
postPatch = ''
substituteInPlace Makefile \
--replace "LDFLAGS+=-static" "LDFLAGS+="
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
]
+3 -3
View File
@@ -10,15 +10,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sftool";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "OpenSiFli";
repo = "sftool";
tag = finalAttrs.version;
hash = "sha256-9q19f5jH+Xx6Sv/5mBthHN6dTDz/+4VumyZcmlxHGa8=";
hash = "sha256-+wEQIVnuzE1DX5Cc5fpvKF8EBq4svhGFHzxtwxZQn7k=";
};
cargoHash = "sha256-MHHIohpUe9EOQ8GAh50Miy4hZhGM4t5gw0G0suusYT0=";
cargoHash = "sha256-tJqF7JYH4Mlw7rH+W8t/Wb4HLH0QqxVxmI3ZIFRke9k=";
nativeBuildInputs = [
pkg-config
+4 -4
View File
@@ -13,19 +13,19 @@
python3Packages.buildPythonApplication rec {
pname = "silver-platter";
version = "0.5.20";
version = "0.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jelmer";
repo = "silver-platter";
rev = version;
hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs=";
tag = "v${version}";
hash = "sha256-b7EYDLoFP77bLk6kodRH4beRLZBnarEZDv3uNg8kFW4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM=";
hash = "sha256-nab0Kkn7JrlnrChnC/WERnhyZEywzZ0LP/bmaAu/G4s=";
};
dependencies = with python3Packages; [
@@ -0,0 +1,17 @@
diff --git a/build/electron/main.js b/build/electron/main.js
index ca36c4b..dbea8c6 100644
--- a/build/electron/main.js
+++ b/build/electron/main.js
@@ -324,12 +324,6 @@ const readEnvVars = async () => {
disableStartup = envVariables.SF_DISABLE_STARTUP;
}
- try {
- await fsPromises.unlink(configFileName, { force: true });
- } catch (err) {
- log.error(`failed to delete env file (${configFileName})`, err.toString());
- }
-
log.info(`Env vars loaded from file. (${configFileName}) `);
return { url, id };
@@ -0,0 +1,104 @@
{
lib,
stdenvNoCC,
requireFile,
copyDesktopItems,
makeDesktopItem,
wrapGAppsHook3,
asar,
dpkg,
electron,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "silverfort-client";
version = "3.7.5";
src = requireFile rec {
name = "${finalAttrs.pname}_${finalAttrs.version}_amd64.deb";
hash = "sha256-eOkSVoucMiGH4sTnC8/3sWMyT9DpnGEYXX+1y2ULDBg=";
message = ''
Due to the commercial license of Silverfort, Nix is unable to download
Silverfort automatically. Please download ${name} manually and add it
to the Nix store using \`nix-prefetch-url file:///\$PWD/${name}\`.
It is recommended to add this file to the garbage collector root
to prevent grabage collection.
'';
};
strictDeps = true;
nativeBuildInputs = [
asar
copyDesktopItems
dpkg
wrapGAppsHook3
];
# Prevent double wrapping
dontWrapGApps = true;
desktopItems = [
(makeDesktopItem {
name = "silverfort-client";
desktopName = "Silverfort Client";
genericName = "Multi-factor authentication client";
comment = "Silverfort Desktop Messaging Client";
icon = "silverfort-client";
exec = "silverfort-client";
categories = [
"Utility"
"Security"
];
keywords = [
"2fa"
"authentication"
"factor"
"mfa"
"multi"
];
startupWMClass = "Silverfort Client";
terminal = false;
})
];
installPhase = ''
runHook preInstall
asar extract "opt/Silverfort Client/resources/app.asar" $TMP/work
# Remove unneeded files
rm $TMP/work/build/{"public assests.zip",robots.txt}
# Install icons
install -Dm444 $TMP/work/build/logo192.png $out/share/icons/hicolor/192x192/apps/silverfort-client.png
install -Dm444 $TMP/work/build/favicon.ico $out/share/icons/hicolor/256x256/apps/silverfort-client.png
install -Dm444 $TMP/work/build/logo512.png $out/share/icons/hicolor/512x512/apps/silverfort-client.png
# By default, Silverfort will delete the envfile after it has been read one time.
# This file is located at "~/.config/Silverfort Client/config.env" and can be configured
# to store environment variables in JSON format.
# For example: `{"SF_MESSAGING_URL":"https://example-sdms-server.net"}`
patch -d $TMP/work -p1 < ${./dont-delete-envfile.patch}
asar pack $TMP/work $out/share/silverfort-client/resources/app.asar
rm -rf $TMP/work
runHook postInstall
'';
postFixup = ''
makeBinaryWrapper "${lib.getExe electron}" $out/bin/silverfort-client \
--add-flags "$out/share/silverfort-client/resources/app.asar" \
--set-default ELECTRON_IS_DEV 0 \
"''${gappsWrapperArgs[@]}"
'';
meta = {
description = "Silverfort multi-factor authentication client";
homepage = "https://www.silverfort.com/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ ungeskriptet ];
mainProgram = "silverfort-client";
};
})
+7 -7
View File
@@ -515,15 +515,15 @@
"jar": "sha256-W3qjoo2ou2Uzt6/eVFl5m5P3n8+GxW0XQttvKHxP1SE=",
"pom": "sha256-PeSwStYORI+xJmrusbRowsWOGLdXv2ilMsw9XdlNVHU="
},
"com/google/protobuf#protobuf-bom/3.21.12": {
"pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU="
"com/google/protobuf#protobuf-bom/4.31.1": {
"pom": "sha256-uLuWyzTeH0tOFaZPTiTsJm8vYYrtr/Y9ruvGlfd5y9E="
},
"com/google/protobuf#protobuf-java/3.21.12": {
"jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=",
"pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU="
"com/google/protobuf#protobuf-java/4.31.1": {
"jar": "sha256-1g3+fGig04okjMqWkk8oncfhlmqIfufK45dwGvCFda4=",
"pom": "sha256-hfCCtSzQbzX0IAbMuBsn3aXuJG/jhq7p91GEWR+Zr1w="
},
"com/google/protobuf#protobuf-parent/3.21.12": {
"pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g="
"com/google/protobuf#protobuf-parent/4.31.1": {
"pom": "sha256-mGt3TUQ+9cluGfMgJ0vNeh7cSo9hzMI+YxJvpkTX9DA="
},
"com/illposed/osc#javaosc-core/0.8": {
"jar": "sha256-7PP/me8hI4cOUWtC4ey+JDiTHqgPOpAFWB3j4JxPEa0=",
+1 -1
View File
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
];
maintainers = with lib.maintainers; [
gale-username
imurx
loucass003
];
platforms = with lib.platforms; darwin ++ linux;
mainProgram = "slimevr-server";
+5 -5
View File
@@ -21,26 +21,26 @@
rustPlatform.buildRustPackage rec {
pname = "slimevr";
version = "0.17.0";
version = "18.1.0";
src = fetchFromGitHub {
owner = "SlimeVR";
repo = "SlimeVR-Server";
tag = "v${version}";
hash = "sha256-/7SQstUWnQcdzRZjY64PL2gfdstUqXhDmwUkCd6bhY4=";
hash = "sha256-vU/dcKRlNsixr3TaCrqNkCd2ewAb38fLymb+ZslAum4=";
# solarxr
fetchSubmodules = true;
};
buildAndTestSubdir = "gui/src-tauri";
cargoHash = "sha256-E825/tkIGphqSPHplDglQPHxPaz8+ZAICuQ/eYZuez4=";
cargoHash = "sha256-X5IgWZlkvsstMN3YS4r+NJl6RVfREfZqKUrfsrUPQuU=";
pnpmDeps = pnpm_9.fetchDeps {
pname = "${pname}-pnpm-deps";
inherit version src;
fetcherVersion = 1;
hash = "sha256-EeIwEej2WiD2HGbZTgNoJTDL0t9H3mJ3+8qrPvgn8vY=";
hash = "sha256-ExjEAr38GX2iZThVj3C3N/9mPgf0Bs7J5OAwtDdmn6I=";
};
nativeBuildInputs = [
@@ -144,7 +144,7 @@ rustPlatform.buildRustPackage rec {
];
maintainers = with lib.maintainers; [
gale-username
imurx
loucass003
];
platforms = with lib.platforms; darwin ++ linux;
broken = stdenv.hostPlatform.isDarwin;
+2 -2
View File
@@ -23,14 +23,14 @@ let
in
buildPythonApplication rec {
pname = "sonata";
version = "1.7.2";
version = "1.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "multani";
repo = "sonata";
tag = "v${version}";
hash = "sha256-B/2wLNbeVJJA/rMc6ZcLqH4SqyW5NzomrVPctIWGaIY=";
hash = "sha256-eyB+DHcAg1nYjE415VjpPnqZC9embYRhnwXhN2ZVN0o=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -7,13 +7,13 @@
}:
buildGo125Module (finalAttrs: {
pname = "terragrunt";
version = "0.93.12";
version = "0.94.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = "terragrunt";
tag = "v${finalAttrs.version}";
hash = "sha256-TiSjKr8A5mxUWgVnWjWB2sgPbqSjIJlf8DetYiuw8No=";
hash = "sha256-agc7tciz9ciz2gFjGsmafc46MgenOAQDyByJN9X4Wm4=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "tinfoil-cli";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = "tinfoilsh";
repo = "tinfoil-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-C5X1+spnhJgynG8vPgU/HMjDikPmm/xNZ/svVQHA9N4=";
hash = "sha256-1nzMNX3Xe30JFRWHmh0k+vtW1wgGqlB4ZHS9ucYyslY=";
};
vendorHash = "sha256-LdCwPXPPt7kxK8FvXN332ih9SMhUWyEfXq+7OLQ+Uv0=";
vendorHash = "sha256-8YzNHlimaUVyrUp8pzWtfpSLDp7PxJ95/qi0ir6TSl8=";
# The attestation test requires internet access
checkFlags = [ "-skip=TestAttestationVerifySEV" ];
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "tofu-ls";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "opentofu";
repo = "tofu-ls";
tag = "v${finalAttrs.version}";
hash = "sha256-1n4BLep3KPku/eqZYsQVu57jq4fcua6pGGWq9oYh2Hg=";
hash = "sha256-BrCBltZJ56SM7XxWy/bgaHXOob8e3cJNfsB3/2k1u0s=";
};
vendorHash = "sha256-y7gyhek1urGVe1se8yd+EqgfeOGDde80AfwIwlk7Zso=";
vendorHash = "sha256-Uq/4rd3OvCBhp53MEMLiWL/V6hkygwdBLSN8Wzwqoew=";
ldflags = [
"-s"
+3 -6
View File
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "typst";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "typst";
repo = "typst";
tag = "v${finalAttrs.version}";
hash = "sha256-GAHG0TF+6rdgVolJLdFw7uVz/UBLsnibcaEvInRf7Jk=";
hash = "sha256-EXcmL/KNj9vCChCs6RH1J/+aetYcXnEdGEhvVzGNNZA=";
leaveDotGit = true;
postFetch = ''
cd $out
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
};
cargoHash = "sha256-UQAKvBlT+c5eUNAmN2lzbjZG1kBrE88CTx2t1F4tprQ=";
cargoHash = "sha256-HDu7/kgpBgUe/CrHm17BkNlg3DYlegTevgAeBCXp6so=";
nativeBuildInputs = [
installShellFiles
@@ -64,9 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
'';
cargoTestFlags = [ "--workspace" ];
# The following test fails when using `release`
# ❌ issue-7257-break-tags-show-par-none (tests/suite/pdftags/break.typ:29) not emitted
checkType = "debug";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -21,7 +21,7 @@
}:
let
version = "1.3.1";
version = "1.3.2";
withSubprojects = stdenv.mkDerivation {
pname = "sources-with-subprojects";
inherit version;
@@ -31,7 +31,7 @@ let
repo = "vivictpp";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-g/M3blW48uwL6v60IU4sRObYvR7Gjjn/X0lYSS86x+0=";
hash = "sha256-s93tqsXiU7NESI594tmHE/2ymaE68lcaGSOM2GDHPLU=";
};
nativeBuildInputs = [
@@ -49,7 +49,7 @@ let
'';
outputHashMode = "recursive";
outputHash = "sha256-UbULDurC6qbcjP+fZJgd0nSVsimAyw3sYC08xeXcI14=";
outputHash = "sha256-RQRlH+wByWRfVyVR/kjjUm9/fLXUupd2yRK80FogzRM=";
};
in
stdenv.mkDerivation {
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "vuetorrent";
version = "2.30.1";
version = "2.31.0";
src = fetchFromGitHub {
owner = "VueTorrent";
repo = "VueTorrent";
tag = "v${version}";
hash = "sha256-sek5kiO1T7s+PIIa0mBGj+9CfF56eRB3En9tsOcEK5Y=";
hash = "sha256-jWoD54cO1Tq9b2k8ySWUWQohT4qE0rW9EVJLoPi8DTA=";
};
npmDepsHash = "sha256-vEgwEYVlyTJLOQ8j6hm1O4iTIXNPDZyrmvXyRBgEvQY=";
npmDepsHash = "sha256-/B/DMTH/5e9YNJ9rl+HTGkAX1KzOoBB1PD68Li2sAAw=";
installPhase = ''
runHook preInstall
+14 -3
View File
@@ -2,12 +2,12 @@
lib,
python3,
fetchFromGitHub,
unstableGitUpdater,
writeScript,
}:
python3.pkgs.buildPythonApplication rec {
pname = "zeekscript";
version = "1.3.2-unstable-2025-11-10";
version = "1.3.2-61";
pyproject = true;
src = fetchFromGitHub {
@@ -36,7 +36,18 @@ python3.pkgs.buildPythonApplication rec {
"zeekscript"
];
passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
passthru.updateScript = writeScript "update-${pname}" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p git common-updater-scripts
tmpdir="$(mktemp -d)"
git clone "${src.gitRepoUrl}" "$tmpdir"
pushd "$tmpdir"
newVersion=$(cat VERSION)
newRevision=$(git log -s -n 1 --pretty='format:%H' VERSION)
popd
rm -rf "$tmpdir"
update-source-version "${pname}" "$newVersion" --rev="$newRevision"
'';
meta = {
description = "Zeek script formatter and analyzer";
@@ -89,6 +89,14 @@ let
''
+ postPatch;
preConfigure = ''
# Copy the source so it can be used by mix projects
# do this before building to avoid build artifacts but after patching
# to include any modifications
mkdir -p $out/src
cp -r "." "$out/src"
'';
buildPhase = ''
runHook preBuild
HOME=. rebar3 bare compile --paths "."
@@ -1,9 +1,9 @@
{
# https://www.aquamaniac.de/rdm/projects/gwenhywfar/files
gwenhywfar = {
version = "5.12.1";
hash = "sha256-0YhEi5w6lwlyFCLuATS50Ld5CrdRQFjZngQ5njlGXdo=";
releaseId = "533";
version = "5.14.1";
hash = "sha256-iRb+qpnLlU+WPyy6jdLf/lfKz38oTa8A6rBxqtb+KrM=";
releaseId = "630";
};
# https://www.aquamaniac.de/rdm/projects/libchipcard/files
@@ -15,8 +15,8 @@
# https://www.aquamaniac.de/rdm/projects/aqbanking/files
aqbanking = {
version = "6.6.1";
hash = "sha256-MlD6bYk/gW0pwZrzX+X8y3TAgOIXU/2eUleaeS3UhWc=";
releaseId = "535";
version = "6.8.2";
hash = "sha256-ELFMktdv8TZS4AtcSWABYB8NlGXFrLGxtoLUUQIkBuw=";
releaseId = "634";
};
}
-3
View File
@@ -33,7 +33,6 @@
mount,
ncurses,
nixos-install-tools,
nixos-rebuild,
procps,
ps,
# known consumers
@@ -288,7 +287,6 @@ rec {
]
++ lib.optionals stdenv.hostPlatform.isLinux [
nixos-install-tools
nixos-rebuild
];
interpreter = "none";
execer = [
@@ -315,7 +313,6 @@ rec {
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
nixos-generate-config fake args
nixos-rebuild fake args
''
);
@@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "42.10.0";
version = "43.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "aioesphomeapi";
tag = "v${version}";
hash = "sha256-My61UXXOe7YNuq7eBltXqXmX6OqnDWUk7HJofAgR2I8=";
hash = "sha256-OUmnamtVCMobTI99aRr81MECG51JHfzQ9bZs0C1Mmcw=";
};
build-system = [
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiohttp-socks";
version = "0.10.2";
version = "0.11.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "aiohttp_socks";
hash = "sha256-lC18huLleUGPx6c0YQ3ZfarwBwfHRi9sz2ebIyV2eTA=";
hash = "sha256-Cv5RY4Unx5B35L1uVwUsh8SCQjPW4guwYcU3ZkIbEPA=";
};
build-system = [ setuptools ];
@@ -53,5 +53,7 @@ toPythonModule (
pythonImportsCheck = [
"aligator"
];
__darwinAllowLocalNetworking = true;
})
)
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "cashews";
version = "7.4.3";
version = "7.4.4";
pyproject = true;
src = fetchFromGitHub {
owner = "Krukov";
repo = "cashews";
tag = version;
hash = "sha256-L6EpSZ6ssRV9fQLuJ6SxKB8QS9fo4qAQ3YKcc1u7sHY=";
hash = "sha256-KYMKqTLXQR7/pgXCOgDb9F2pelw9uyjEeJAwhWuXEZ8=";
};
build-system = [ setuptools ];
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "cf-xarray";
version = "0.10.9";
version = "0.10.10";
pyproject = true;
src = fetchFromGitHub {
owner = "xarray-contrib";
repo = "cf-xarray";
tag = "v${version}";
hash = "sha256-tYs+aZp/QbM166KNj4MjIjqS6LcuDCyXwghSoF5rj4M=";
hash = "sha256-t6b4Tog0BLk5y+wi3QH6IKLbJSKw5NkLa3kJRtSBKRs=";
};
build-system = [
@@ -53,5 +53,7 @@ toPythonModule (
pythonImportsCheck = [
"crocoddyl"
];
__darwinAllowLocalNetworking = true;
})
)
@@ -1,91 +1,151 @@
{
lib,
azure-storage-blob,
buildPythonPackage,
fetchpatch,
fetchFromGitHub,
flask,
flask-mongoengine,
flask-sqlalchemy,
geoalchemy2,
mongoengine,
pillow,
psycopg2,
pymongo,
pytestCheckHook,
flit-core,
lib,
pythonOlder,
setuptools,
shapely,
sqlalchemy,
wtf-peewee,
# dependencies
flask,
jinja2,
markupsafe,
werkzeug,
wtforms,
typing-extensions,
# optional dependencies
# sqlalchemy
flask-sqlalchemy,
sqlalchemy,
# sqlalchemy-with-utils
arrow,
colour,
email-validator,
sqlalchemy-citext,
sqlalchemy-utils,
# geoalchemy
geoalchemy2,
shapely,
# pymongo
pymongo,
# mongoengine
mongoengine,
# peewee
peewee,
wtf-peewee,
# s3
boto3,
# azure-blob-storage
azure-storage-blob,
# images
pillow,
# export
tablib,
# rediscli
redis,
# translation
flask-babel,
# checks
beautifulsoup4,
moto,
psycopg2,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "flask-admin";
version = "1.6.1";
version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "flask-admin";
repo = "flask-admin";
tag = "v${version}";
hash = "sha256-L8Q9uPpoen6ZvuF2bithCMSgc6X5khD1EqH2FJPspZc=";
hash = "sha256-HjK+ddMtT8QJ/KSFj9v28jflf2f6M+Gx1rJjCdWUUFM=";
};
patches = [
# https://github.com/flask-admin/flask-admin/pull/2374
(fetchpatch {
name = "pillow-10-compatibility.patch";
url = "https://github.com/flask-admin/flask-admin/commit/96b92deef8b087e86a9dc3e84381d254ea5c0342.patch";
hash = "sha256-iR5kxyeZaEyved5InZuPmcglTD77zW18/eSHGwOuW40=";
})
];
build-system = [ setuptools ];
build-system = [ flit-core ];
dependencies = [
flask
jinja2
markupsafe
werkzeug
wtforms
]
++ lib.optionals (pythonOlder "3.11") [
typing-extensions
];
optional-dependencies = {
azure = [ azure-storage-blob ];
sqlalchemy = [
flask-sqlalchemy
sqlalchemy
];
sqlalchemy-with-utils = optional-dependencies.sqlalchemy ++ [
arrow
colour
email-validator
sqlalchemy-citext
sqlalchemy-utils
];
geoalchemy = optional-dependencies.sqlalchemy ++ [
geoalchemy2
shapely
];
pymongo = [ pymongo ];
mongoengine = [ mongoengine ];
peewee = [
peewee
wtf-peewee
];
s3 = [ boto3 ];
azure-blob-storage = [ azure-storage-blob ];
images = [ pillow ];
export = [ tablib ];
rediscli = [ redis ];
translation = [ flask-babel ];
all = lib.flatten [
optional-dependencies.sqlalchemy
optional-dependencies.sqlalchemy-with-utils
optional-dependencies.geoalchemy
optional-dependencies.pymongo
optional-dependencies.mongoengine
optional-dependencies.peewee
optional-dependencies.s3
optional-dependencies.azure-blob-storage
optional-dependencies.images
optional-dependencies.export
optional-dependencies.rediscli
optional-dependencies.translation
];
};
nativeCheckInputs = [
pillow
mongoengine
pymongo
wtf-peewee
sqlalchemy
flask-mongoengine
flask-sqlalchemy
# flask-babelex # broken and removed
shapely
geoalchemy2
beautifulsoup4
moto
psycopg2
pytestCheckHook
]
++ lib.flatten [
optional-dependencies.sqlalchemy-with-utils
optional-dependencies.mongoengine
optional-dependencies.peewee
optional-dependencies.images
optional-dependencies.export
optional-dependencies.translation
flask.optional-dependencies.async
];
disabledTestPaths = [
# depends on flask-babelex
"flask_admin/tests/sqla/test_basic.py"
"flask_admin/tests/sqla/test_form_rules.py"
"flask_admin/tests/sqla/test_multi_pk.py"
"flask_admin/tests/sqla/test_postgres.py"
"flask_admin/tests/sqla/test_translation.py"
# broken
"flask_admin/tests/sqla/test_inlineform.py"
"flask_admin/tests/test_model.py"
"flask_admin/tests/fileadmin/test_fileadmin.py"
# requires database
"flask_admin/tests/geoa/test_basic.py"
"flask_admin/tests/pymongo/test_basic.py"
"flask_admin/tests/mongoengine/test_basic.py"
"flask_admin/tests/peeweemodel/test_basic.py"
"flask_admin/tests/sqla/test_postgres.py"
# requires internet
"flask_admin/tests/fileadmin/test_fileadmin_azure.py"
];
pythonImportsCheck = [ "flask_admin" ];
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "hcloud";
version = "2.11.1";
version = "2.12.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-8hL+H1PL+J7d2sDnAF7C6wIep4n4K+cJe9dM1wWynys=";
hash = "sha256-8UWxjvxtcP/z1IskTt/eKcD+Pd37utz+cdY/QfUkQfc=";
};
build-system = [ setuptools ];
@@ -7,14 +7,14 @@
}:
buildPythonPackage rec {
pname = "kernels";
version = "0.11.2";
version = "0.11.3";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "kernels";
tag = "v${version}";
hash = "sha256-fEi7yiLv0a28SefOcF8so9CpNuTinBfrTbEAwwPlKiw=";
hash = "sha256-dU6oSYjFSIkrCo+Zf2B0ILqIVbA6la+bZJ2SrqX0c+U=";
};
build-system = [
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "metaflow";
version = "2.19.13";
version = "2.19.14";
pyproject = true;
src = fetchFromGitHub {
owner = "Netflix";
repo = "metaflow";
tag = version;
hash = "sha256-P5Ic1n69uAAL2FllmooV5vBfjgKTM8l1iKpEIJsHSwU=";
hash = "sha256-ytZbBnynNhrGRkTTQr5Ovcj0pndJTvLbKlikMn1WOFk=";
};
build-system = [
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "plotnine";
version = "0.15.1";
version = "0.15.2";
pyproject = true;
src = fetchFromGitHub {
owner = "has2k1";
repo = "plotnine";
tag = "v${version}";
hash = "sha256-vYrfA7x/64VHHbcgpvQZ1kyHM0jTS9Cx9a8NzVgs4og=";
hash = "sha256-JjSBcPRMmxAIoQsr8ESfgcf+EWBLsq1H+q56iyD3X84=";
};
build-system = [ setuptools-scm ];
@@ -1,4 +1,5 @@
{
aiohttp,
buildPythonPackage,
fetchFromGitHub,
lib,
@@ -9,19 +10,20 @@
buildPythonPackage rec {
pname = "py-dactyl";
version = "2.0.7";
version = "2.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "iamkubi";
repo = "pydactyl";
tag = "v${version}";
hash = "sha256-4WzQQs4WP5AwO8idZsP6J71CwnoD1ilC5Tpcepnf26c=";
hash = "sha256-1bvdJ9ATF0cRy7WE8H2IV2WIMbiSnRnelGpWIN7VBRQ=";
};
build-system = [ setuptools ];
dependencies = [
aiohttp
requests
];
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyecotrend-ista";
version = "3.4.0";
version = "3.5.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Ludy87";
repo = "pyecotrend-ista";
tag = version;
hash = "sha256-GPbRlvdXLxCNuhuELg2OQT5NB8qX+bcbZSRdQimqGtQ=";
hash = "sha256-O5HU0U19E+cS1/UVYouxbyTBNjenJw9kkH80GCZ04cw=";
};
postPatch = ''
@@ -48,14 +48,14 @@
buildPythonPackage rec {
pname = "pymobiledevice3";
version = "6.1.6";
version = "6.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "doronz88";
repo = "pymobiledevice3";
tag = "v${version}";
hash = "sha256-RolQCmccQ+i9R5xGw5ah4GIMSVVcEEvRuvXERXejy5Y=";
hash = "sha256-Sc02p2zZb/CPYFU+lz6fe1UZgWhdJYH2/pSJ5gVE0iY=";
};
build-system = [
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "python-xapp";
version = "3.0.0";
version = "3.0.1";
format = "other";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "linuxmint";
repo = "python-xapp";
rev = version;
hash = "sha256-OvYbMu/2cQLTHHbHh4zESf1X22AfZe8ZEfzeOBDcU90=";
hash = "sha256-mrFKK8541HuMHpRMGvvJcSshbpA99Y712ztAMfFj5m4=";
};
nativeBuildInputs = [
@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "unstructured-inference";
version = "1.1.2";
version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Unstructured-IO";
repo = "unstructured-inference";
tag = version;
hash = "sha256-XoGjcF9xxqZ1fEtI+ifjwEqxNlDHdakZLo8xzFKK8ic=";
hash = "sha256-/vWyywsnNzkwcl2L5BcS6qqaCk2LPxaNlCPeMnDIHPU=";
};
build-system = [ setuptools ];
+216 -216
View File
@@ -1,362 +1,362 @@
{
"attica": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/attica-6.20.0.tar.xz",
"hash": "sha256-jvla0nmHYyAs3WWVIbvmTKWOyMpoRl6s5KgXov8uTcQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/attica-6.21.0.tar.xz",
"hash": "sha256-eI1ClRojey6swoUW+igfXwVLbXiCcAfys4PB0CLIS2M="
},
"baloo": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/baloo-6.20.0.tar.xz",
"hash": "sha256-BqDcJLnK4IxyKK68MhUYUEK1jE/FjvhsiGPld0k9ExQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/baloo-6.21.0.tar.xz",
"hash": "sha256-XP74gwSFp9Qg+63KZ81EGCK8We/BxxsK/vIzuXVTdx4="
},
"bluez-qt": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/bluez-qt-6.20.0.tar.xz",
"hash": "sha256-aWuYVTE7Tqo68Ke67u3baRguVYN1TRopYC+iSZcS7jc="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/bluez-qt-6.21.0.tar.xz",
"hash": "sha256-6pGgTCbKYPpofs2nsJ3y30zBglTf6uTDqpE0quaZQ98="
},
"breeze-icons": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/breeze-icons-6.20.0.tar.xz",
"hash": "sha256-CkeyigSghsy1tK+1HWZ3GAAGgZ0NkwJSRyFom/pK0Tw="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/breeze-icons-6.21.0.tar.xz",
"hash": "sha256-Oi1bATEpNnPhjw+3iAC0tKI+7+5IHpDroD3hfOr/XxU="
},
"extra-cmake-modules": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/extra-cmake-modules-6.20.0.tar.xz",
"hash": "sha256-NxHehXLbXaYY7+PyjMCUyiWhq7C93/xj3O0SxPjKrl8="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/extra-cmake-modules-6.21.0.tar.xz",
"hash": "sha256-JnxUZ81lVaCvDUAQ8OwGlx+A8b1ckFY0JKhZO8CXanA="
},
"frameworkintegration": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/frameworkintegration-6.20.0.tar.xz",
"hash": "sha256-HuYcksEhQVmHfA4ROpI1hyT5rD7ldxChUDjIXcT9x9g="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/frameworkintegration-6.21.0.tar.xz",
"hash": "sha256-rrgDPnyvwrcqk4V9fohx/aKoE4WmrNJ/QJ3ueauk2pc="
},
"kapidox": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kapidox-6.20.0.tar.xz",
"hash": "sha256-7K8kuEuSRT7aCCLVrvGOBH5ihI+AsBnDCDLsVygvq9M="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kapidox-6.21.0.tar.xz",
"hash": "sha256-bk249BnaNeVi3KH6dXYYU3X3vy77TvBo1+k7iA8yCF8="
},
"karchive": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/karchive-6.20.0.tar.xz",
"hash": "sha256-9qUI1TfSg+KhBuhIqTnpcc3xoFl3mCXkSCYJqpgf+t0="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/karchive-6.21.0.tar.xz",
"hash": "sha256-pffM2QQQUIPEQryCXBmIcr23oAmysrswsDjavWuxxsQ="
},
"kauth": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kauth-6.20.0.tar.xz",
"hash": "sha256-qRhFX0LhafpV6WXkB1iMIssYvrVSnasyHUWsr9t71lI="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kauth-6.21.0.tar.xz",
"hash": "sha256-msTaU7QtDCqz42Je0ZtfTa/ZqZxDlparSdvwto+iEZo="
},
"kbookmarks": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kbookmarks-6.20.0.tar.xz",
"hash": "sha256-OWfTkBVecYPdXeAIeqS7EiZJWDMawYofjEBaXtvcGhQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kbookmarks-6.21.0.tar.xz",
"hash": "sha256-BuLVrSIyTEpoCa6PajGSAEq9jcVru1soHBgo8y3I4Ho="
},
"kcalendarcore": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcalendarcore-6.20.0.tar.xz",
"hash": "sha256-X2ECezRRDQ3i8rFRwnmwAKoX4cNJBv8F4PAIbu0vN4U="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcalendarcore-6.21.0.tar.xz",
"hash": "sha256-xaCqyLuLDQB6bqROnqK3/wfNcBNpqQSP+V+e6y40QX8="
},
"kcmutils": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcmutils-6.20.0.tar.xz",
"hash": "sha256-otcmx7a4/q3f8p3A514cFUZ/AtHr5vjpbzXNhLI+Fu0="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcmutils-6.21.0.tar.xz",
"hash": "sha256-nBgIFT2cFqqgjmi2NTzlya9nsuJLmgzXWHxGpKgejtw="
},
"kcodecs": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcodecs-6.20.0.tar.xz",
"hash": "sha256-FZILmoWTQbE4MebtSbrO6i5yjHlv3QghKOUfjhJ/86A="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcodecs-6.21.0.tar.xz",
"hash": "sha256-2aAV6U5s+dEO4scibdECUkaJFHwwByxHK27tG3NWfhY="
},
"kcolorscheme": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcolorscheme-6.20.0.tar.xz",
"hash": "sha256-FQWsxpsswb6a0yWnCrlmm7jTFvxdYBzPQDK+Ivq4wMI="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcolorscheme-6.21.0.tar.xz",
"hash": "sha256-+WuyNQP/bvJiFJKkNgAAGaGXwBEk6A+JQWTG9ISY+60="
},
"kcompletion": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcompletion-6.20.0.tar.xz",
"hash": "sha256-OycAA7Zh24lPUOn5D93dMJw+qXAQ42O8VR91Lbbvzsw="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcompletion-6.21.0.tar.xz",
"hash": "sha256-kNUfNdCZdiNEj+R3M3K/3Zboaa/Ub9qAnX7Y0+iKNbo="
},
"kconfig": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kconfig-6.20.0.tar.xz",
"hash": "sha256-2uz0mJr5lYFEE55JGMIs0FtallJ8Udc36ufFdxgWfRU="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kconfig-6.21.0.tar.xz",
"hash": "sha256-DMHQuSImz+m4mUaAecwhOTn7+L3VuR5UVLyM38jzTiA="
},
"kconfigwidgets": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kconfigwidgets-6.20.0.tar.xz",
"hash": "sha256-XF6Nx+mG2Fw2ArilK42JCfkedDPsrYA3CZSRJQ9fTjY="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kconfigwidgets-6.21.0.tar.xz",
"hash": "sha256-lja0WGHH6KBb1DK/+UyXEmcDENTjBmkxWAhDAgMltiM="
},
"kcontacts": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcontacts-6.20.0.tar.xz",
"hash": "sha256-slPNSGSj89Q0NIXMS/4bA0TM9RNurSraNZ5pM+CSU94="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcontacts-6.21.0.tar.xz",
"hash": "sha256-pr948Q12gLZjZrFEMXRrOx003DE/Hue+ibGaR2Fir2Q="
},
"kcoreaddons": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcoreaddons-6.20.0.tar.xz",
"hash": "sha256-wdRVh2Ft9eqjZnoCix9/kJyccjCsQtYtppz7KsRs1QU="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcoreaddons-6.21.0.tar.xz",
"hash": "sha256-RGHct75mzFUQHCqVfAjHhx8rPqfdbwFxg4ZsRTQWPkk="
},
"kcrash": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kcrash-6.20.0.tar.xz",
"hash": "sha256-H0LpxU6tny2Bs+xerPVatv9N0cOgchxo86s57UbzWXM="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kcrash-6.21.0.tar.xz",
"hash": "sha256-CEVcJ7ZoRS3KK7N5VqyC5MHnBS32lJuNYizhHlyfTJQ="
},
"kdav": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdav-6.20.0.tar.xz",
"hash": "sha256-vRjVo9sBwnetydoy3SCkX8lbKLEfv/U5mEKwUkpJ0IQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdav-6.21.0.tar.xz",
"hash": "sha256-ta+kLuFkBLvWYmgvGmZhDvW2R56rpulRDak084Z/muI="
},
"kdbusaddons": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdbusaddons-6.20.0.tar.xz",
"hash": "sha256-XbL2tyNSOAcCJO6KUiX0H/2zJJ1VioGnwGqOVNZ3Kfc="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdbusaddons-6.21.0.tar.xz",
"hash": "sha256-tfTucf7vPiwj8e69iaxnlpQL2sj1RCm1z5S6+xBGInk="
},
"kdeclarative": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdeclarative-6.20.0.tar.xz",
"hash": "sha256-sBx/oCct0szMlipgbmMyiCW9O4yOwI7jbDzqdfqKMU0="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdeclarative-6.21.0.tar.xz",
"hash": "sha256-BH2iAVNdQf/dCr/+LMuwh0rJ6Y3VCFF3JqocmaRv3rk="
},
"kded": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kded-6.20.0.tar.xz",
"hash": "sha256-HWyVAEjgW56AOM/fhJY9HUuL/F8ybzAedDIReR6an2U="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kded-6.21.0.tar.xz",
"hash": "sha256-NlMs/47Zi9BMnUwz5aFei78UQCK59AZcbF10VagC3aE="
},
"kdesu": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdesu-6.20.0.tar.xz",
"hash": "sha256-3iMT9C9XuJafr/Ez8OKyFMW6lokcFhZFEhMPzLXz+4Q="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdesu-6.21.0.tar.xz",
"hash": "sha256-UCnWRvFgfVQ4XQq77Yqr8ehEvt5EXEEZmKob3PC4X3Y="
},
"kdnssd": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdnssd-6.20.0.tar.xz",
"hash": "sha256-/GFuf51W/0MEpb3G0E5+915f99hDdRdfCyWkS6ia9go="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdnssd-6.21.0.tar.xz",
"hash": "sha256-c9cskvMEkTPw/su8W4AkQMxi3Rb47MyLLMR83QtwVyk="
},
"kdoctools": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kdoctools-6.20.0.tar.xz",
"hash": "sha256-9WU2JVynRVSpwC05X9eMi0oNKhx9ADzmIbMk6In4XA8="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kdoctools-6.21.0.tar.xz",
"hash": "sha256-CQc8C0L/a1u/kofN2POj+4pOdg4lLdJxh3EWFYkye5A="
},
"kfilemetadata": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kfilemetadata-6.20.0.tar.xz",
"hash": "sha256-MxZQXcgmzt5AnGBizofKF2gBR6dgVEA2wxc5+/dVf5c="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kfilemetadata-6.21.0.tar.xz",
"hash": "sha256-2P38xUNCALJsouRuE8Qi1BW3ethiE9VhUm2oFvZT8KQ="
},
"kglobalaccel": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kglobalaccel-6.20.0.tar.xz",
"hash": "sha256-7iq9kd9Hpq5Hj4bmf0Y0h+MAMvPA2M/Xfy1rlWfIbbQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kglobalaccel-6.21.0.tar.xz",
"hash": "sha256-Pmi4+1ci11mCyZU0R40obf41lWDKXYoQKTypDzAa7+M="
},
"kguiaddons": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kguiaddons-6.20.0.tar.xz",
"hash": "sha256-M8r1rkbxpiFPVllhgODGzLSvLM4NyuBgrk+3B4JgpHY="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kguiaddons-6.21.0.tar.xz",
"hash": "sha256-EknvdCvJ/M6Bs5O8RuSeIMJB54f63DFsKu0HUVKzfdA="
},
"kholidays": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kholidays-6.20.0.tar.xz",
"hash": "sha256-spp6J/hfO1M8AgAr1e/Tdf7WQmjomMtA5tN3sNckOGQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kholidays-6.21.0.tar.xz",
"hash": "sha256-keaCD/ZS6ncbIhOXRVnn/0urttnzV/QLjHIma9BDK+Q="
},
"ki18n": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/ki18n-6.20.0.tar.xz",
"hash": "sha256-8pyAUTevnO5qurQks4D+qWSlmwifkPuQlgHZ/HjfX3M="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/ki18n-6.21.0.tar.xz",
"hash": "sha256-1bIwRaTpiccoboZpZUQYDsdqxf0Fe1DDW9AHsnlpTY8="
},
"kiconthemes": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kiconthemes-6.20.0.tar.xz",
"hash": "sha256-YbkGBRzWbbHdJZ7HbQiIXT/nSeDTlHrqdJAh0sllN6U="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kiconthemes-6.21.0.tar.xz",
"hash": "sha256-hzR3435v0DulZDCoT4Di4EPM7GHRPeh2JjuPIgEx3WI="
},
"kidletime": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kidletime-6.20.0.tar.xz",
"hash": "sha256-7LysXgYqJ9MWF0fWv0ndYDKBo3jSbASJFediqxlFQNk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kidletime-6.21.0.tar.xz",
"hash": "sha256-+DqUXifEE3cdIBA/ZjF4OjoNjj8lvzptGBfEt8dmwj4="
},
"kimageformats": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kimageformats-6.20.0.tar.xz",
"hash": "sha256-vb2R8BuIthvFs+f2AVOui2PV8fKEDp6zGui3M597jXk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kimageformats-6.21.0.tar.xz",
"hash": "sha256-nHVrgeYdi17MpudWJpRUzsNhmhoTpDgDyyEEeWy/+FA="
},
"kio": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kio-6.20.0.tar.xz",
"hash": "sha256-fmfUcfwQt989dubOhZSAvl1uZ10xZZLnqEGbl/Ab1kk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kio-6.21.0.tar.xz",
"hash": "sha256-svc6M7gCy1K7nnw1NdMV1cYW1VTj7QfKcRyiUdsxBcY="
},
"kirigami": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kirigami-6.20.0.tar.xz",
"hash": "sha256-tn/qciXM70zv0KnTpUdIMVASkWfEdZVzbqxFeYb3Cdk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kirigami-6.21.0.tar.xz",
"hash": "sha256-6+DqddEh4vRQhJzpOULUbj8Go+JB0Ayjs72gHdyYC9k="
},
"kitemmodels": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kitemmodels-6.20.0.tar.xz",
"hash": "sha256-RbbNVHj+NfCWanXjzFVKXbhBisfWOHdFoAcPOcr5Iak="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kitemmodels-6.21.0.tar.xz",
"hash": "sha256-WTkLbKTPSjBeObEQgOGu9yxTa+Vy8A9CjR2WGtJQve4="
},
"kitemviews": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kitemviews-6.20.0.tar.xz",
"hash": "sha256-Y/bWR4DT6xv90vL5A2Amos3BY7Z2Fowpwnl1RPmtYwU="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kitemviews-6.21.0.tar.xz",
"hash": "sha256-O6qDbv+SPh3LPZid1GT7PDy5zpysamcj5+fBAI8VakY="
},
"kjobwidgets": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kjobwidgets-6.20.0.tar.xz",
"hash": "sha256-OTtutrNdaA1Ipcewk1lmi93B7YnU+nC4qKgfsthBzno="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kjobwidgets-6.21.0.tar.xz",
"hash": "sha256-iSs71Kgz65tyqJzM1HEza4CdeUUVv9nWuzNfG5EVefY="
},
"knewstuff": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/knewstuff-6.20.0.tar.xz",
"hash": "sha256-SUQ63U8cqs4uZP59y+TPeM1raSvwx3ugEILIJ2Hfork="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/knewstuff-6.21.0.tar.xz",
"hash": "sha256-Z884BR15tSdb42Q4LF0UM9fBqEwPPOmtggY0Esjhr00="
},
"knotifications": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/knotifications-6.20.0.tar.xz",
"hash": "sha256-qubZKOr1JUC2Qr2cfqYpPiwND1NhLl+08KYAFpL4BVo="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/knotifications-6.21.0.tar.xz",
"hash": "sha256-XJ4+rVAvfbxoNSVdVfsz2+StZilYd/8IqyIaQtsIBa0="
},
"knotifyconfig": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/knotifyconfig-6.20.0.tar.xz",
"hash": "sha256-oCGW5Q9I2tCQhlbjJF1YvwOw05EC+pKwVr7n1QuRr6c="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/knotifyconfig-6.21.0.tar.xz",
"hash": "sha256-H+dGFVMwTqQu27PpDciEl7UFhswsR9n2uKK00odKG0c="
},
"kpackage": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kpackage-6.20.0.tar.xz",
"hash": "sha256-YYhBFK9gT4J8S4NjRVHqZJIQUOIzycbV/EALl+QCUp4="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kpackage-6.21.0.tar.xz",
"hash": "sha256-PFqWsH4orJDlHfo6/BeQIT6eGR2GfxEhMjdclaoEPHY="
},
"kparts": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kparts-6.20.0.tar.xz",
"hash": "sha256-nnHj0gyVJfZlM916WEbw2YLu/ddCW/ut7NaheQjr1wk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kparts-6.21.0.tar.xz",
"hash": "sha256-0A/I1zEZnEzJ+VDyWgCbOyEdA9DLNbMmc19ydDYaCRU="
},
"kpeople": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kpeople-6.20.0.tar.xz",
"hash": "sha256-cvd1HViefXIEZloa34dRq9vb1uS1gmYsMT7HndsBP7I="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kpeople-6.21.0.tar.xz",
"hash": "sha256-d9vRkjpS5YwNuoTGqW3kVTL3Lf6BTs5bhOaZvZwPTmE="
},
"kplotting": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kplotting-6.20.0.tar.xz",
"hash": "sha256-UM2Jhqz0fpqMDfKxHwaKedJBoT9uQmdxcDqeGI5qpD8="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kplotting-6.21.0.tar.xz",
"hash": "sha256-x7MZu1PLZSk6RusgntSP1MxRf/ureGVMSK1/wuyjL78="
},
"kpty": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kpty-6.20.0.tar.xz",
"hash": "sha256-ZmbwXxc1IJ2m/K4f0h/5SuZ3LTKwok97hM21biIgKWY="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kpty-6.21.0.tar.xz",
"hash": "sha256-Oru0uc3ok11wml3JDr3zcdiejdX6JNJDxE3+3nh367g="
},
"kquickcharts": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kquickcharts-6.20.0.tar.xz",
"hash": "sha256-lPUs5CwVy33FFM6YaNukHtjwZFuUH/IlbQIid0YwF5I="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kquickcharts-6.21.0.tar.xz",
"hash": "sha256-0AqnHa6YudvcPS8buQ05ZHs/KuXhDDqk7GEXNe46pUg="
},
"krunner": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/krunner-6.20.0.tar.xz",
"hash": "sha256-c1ss8VPtG9IjOJ8ptLYZMZ+7MQBx2sbH6frdoRldOhw="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/krunner-6.21.0.tar.xz",
"hash": "sha256-8Z3MVjSfEngodXKq8nPOh8d0+e7JnixDaOFkuu1RKKU="
},
"kservice": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kservice-6.20.0.tar.xz",
"hash": "sha256-wzpbzSzhVOJ175RFkBooE8JJQ+JOryOC0khlcXiSNTw="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kservice-6.21.0.tar.xz",
"hash": "sha256-u8fCpjvkTvmmpDh3eVDivDxh84HrEBwL4/AREesENRc="
},
"kstatusnotifieritem": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kstatusnotifieritem-6.20.0.tar.xz",
"hash": "sha256-2w7bkosVcISH6orQB9tLzzlJMyaYzHi07XUSi+obL6Y="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kstatusnotifieritem-6.21.0.tar.xz",
"hash": "sha256-531NlDr4P9EggNvG7LnBNVofooLvvYnt+iU4TWc/1mA="
},
"ksvg": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/ksvg-6.20.0.tar.xz",
"hash": "sha256-f/Qc8Yr50apIYqUukVHgoZaAmfcdoH2oRU2IDWdpVqg="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/ksvg-6.21.0.tar.xz",
"hash": "sha256-XHUfCHeHxE4LZWxmxo2vEv1+Gg+MorehZyalFsAs/lk="
},
"ktexteditor": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/ktexteditor-6.20.0.tar.xz",
"hash": "sha256-P1nRb9cd4lj+Uxtlcg12T6uF0LPPBCMgHJ9mxAQuZMw="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/ktexteditor-6.21.0.tar.xz",
"hash": "sha256-0dguzuh3+wZu59etFPLekMn2uCHYyXwOeEqYXMP5ncQ="
},
"ktexttemplate": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/ktexttemplate-6.20.0.tar.xz",
"hash": "sha256-FRWVkQX87XRoPJGqG7+JM4J5YUwe17F6vpVOARRPTBk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/ktexttemplate-6.21.0.tar.xz",
"hash": "sha256-hkZn2iGQo83UKSadkwM1fr/rPEw0y2UQcdSCxW+Ldy0="
},
"ktextwidgets": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/ktextwidgets-6.20.0.tar.xz",
"hash": "sha256-eB5/rVcg3n8xOAssSkWLwodZQESe2RaLSMYNR0tt8iA="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/ktextwidgets-6.21.0.tar.xz",
"hash": "sha256-HJPuryrIKXurruIHX4GIze4mwyscjCDDqVt7yrb/v6s="
},
"kunitconversion": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kunitconversion-6.20.0.tar.xz",
"hash": "sha256-WrTuOFPnew1qaaZkQ3JLCeqmEhq4Nf7UbQkdNeb+qj8="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kunitconversion-6.21.0.tar.xz",
"hash": "sha256-YAEaYGg1YNYxfH68nRv/09snZ1bZALKk9JYwesKbrZ0="
},
"kuserfeedback": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kuserfeedback-6.20.0.tar.xz",
"hash": "sha256-Y4zU6SE3KE3hhiCUVEFEc5EXOk9nhbqp5rg4VbuoCLQ="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kuserfeedback-6.21.0.tar.xz",
"hash": "sha256-jE9bjFqcT2x9KE8dV/fzPa/cZmhMs16bgKvb7fA10sw="
},
"kwallet": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kwallet-6.20.0.tar.xz",
"hash": "sha256-tlZa0EGlfTkLNyimWZ/A4zl4TSpNq1mQrORauqUC5B4="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kwallet-6.21.0.tar.xz",
"hash": "sha256-BA2ernTsUWTAwg5ZRp90wlsBOcnlXu8+nzv6Wi4If0g="
},
"kwidgetsaddons": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kwidgetsaddons-6.20.0.tar.xz",
"hash": "sha256-OZdLhc3/2MbW4KXAaEknoh4HHB5j18zjiIMx8BaaSDc="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kwidgetsaddons-6.21.0.tar.xz",
"hash": "sha256-FKk4Qmgxw14CGlfLKYm24Lk3m5Ntv+8+5aMzWkaJ0rw="
},
"kwindowsystem": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kwindowsystem-6.20.0.tar.xz",
"hash": "sha256-g2vgBd88jPyB2coZnxnja6DfUV1p59iwY0NGVBL29Hc="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kwindowsystem-6.21.0.tar.xz",
"hash": "sha256-NGYLFU6FjS8umW2Y/Cy0aImpOFUbt5nnW6L7bx0GQTM="
},
"kxmlgui": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/kxmlgui-6.20.0.tar.xz",
"hash": "sha256-oW/Tc0ESkU71DtJmahaQXYfmeVS8NoclzLHVsu3I+PE="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/kxmlgui-6.21.0.tar.xz",
"hash": "sha256-zr85C2W9U1XWQbW+27yAcSnTmEqLwhsI1yaBXG2blww="
},
"modemmanager-qt": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/modemmanager-qt-6.20.0.tar.xz",
"hash": "sha256-GmBrJlMN5NnCcsuXk7Y7JegP56nAth5CI5lFP/Xlynk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/modemmanager-qt-6.21.0.tar.xz",
"hash": "sha256-WMyuvnqPlHDCN5gN/zafDyzLV4L813uqolJ5yED8i2A="
},
"networkmanager-qt": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/networkmanager-qt-6.20.0.tar.xz",
"hash": "sha256-aFb+yykzq82tCniaF55AVM8kkB3Cn5Q/ADaj4Vz0PoY="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/networkmanager-qt-6.21.0.tar.xz",
"hash": "sha256-U1MLKNIfGek/Bjg/P/svQ/lMG/dRp+pDdjGkHtel8UA="
},
"prison": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/prison-6.20.0.tar.xz",
"hash": "sha256-NuxvguzDwGYY1FXMFpirEXVNZC+rPxuFCnzwHOEbPR8="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/prison-6.21.0.tar.xz",
"hash": "sha256-BIulls2OCNNvqhF57DevSD6p7BAXEBhtdSmBF7wJiis="
},
"purpose": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/purpose-6.20.0.tar.xz",
"hash": "sha256-OjOgaVNPXPzXUeZ7fcN3hfO47J0CfPHXoNQvD/v8mFc="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/purpose-6.21.0.tar.xz",
"hash": "sha256-AyaHerizJJFIK4CSXRuG+4p6fzpYfdElFi5/tVqNXoc="
},
"qqc2-desktop-style": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/qqc2-desktop-style-6.20.0.tar.xz",
"hash": "sha256-D50V/w3TuXRFYzYIYMux4Tex2biTdiEOcyiqoC7Uq34="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/qqc2-desktop-style-6.21.0.tar.xz",
"hash": "sha256-4gF7Ny614bEpfkhTOwta1gKoW1aH5ZMS9+zpHNFLdjg="
},
"solid": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/solid-6.20.0.tar.xz",
"hash": "sha256-Ayg4GEWhHPz6jBjI1gyd97haB7zXsb02txx+s8w0ktY="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/solid-6.21.0.tar.xz",
"hash": "sha256-P/0H6LYjNkyDw2sjeyg4PJFlEnJRKfzw+j/0a3KJBig="
},
"sonnet": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/sonnet-6.20.0.tar.xz",
"hash": "sha256-NWzdr3zyqryvhQMUuySPpWoVuChf6nTY86fH5N7CqDo="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/sonnet-6.21.0.tar.xz",
"hash": "sha256-AEZtUQCuHS6vDP5J9XYFWiwl2mQxEYqO+NrwmmFeVn8="
},
"syndication": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/syndication-6.20.0.tar.xz",
"hash": "sha256-4reeqVio7f1MnAeQklzEPR9AMexl7lRaYFkQCL4VkkI="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/syndication-6.21.0.tar.xz",
"hash": "sha256-fqP21GcQpu4Sw3ZLP1s6IkCyLKAfEGcAJitGslsOCrs="
},
"syntax-highlighting": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/syntax-highlighting-6.20.0.tar.xz",
"hash": "sha256-bihio4V8EemnWszG46z8wW9jTuh4WGtNKpe1c/Ur/cA="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/syntax-highlighting-6.21.0.tar.xz",
"hash": "sha256-61LmkLynms1OhGEOEQ/y9jhNUWZ9bYzRZtjpKZ5dtFk="
},
"threadweaver": {
"version": "6.20.0",
"url": "mirror://kde/stable/frameworks/6.20/threadweaver-6.20.0.tar.xz",
"hash": "sha256-kxPyWi6m4kMdNOCwD2ja1ogYScNPHkBRWlOacN1vuxk="
"version": "6.21.0",
"url": "mirror://kde/stable/frameworks/6.21/threadweaver-6.21.0.tar.xz",
"hash": "sha256-PW+UciyjKfFpfoDYNF2W5RMEcHc5m767Djos3Bd/BOU="
}
}
@@ -25,18 +25,18 @@
"lts": true
},
"6.12": {
"version": "6.12.61",
"hash": "sha256:0d8pbx0j5g2ag4im5k3dcqiwp5jxjja29p195zqpd1jj0m8p8s8s",
"version": "6.12.62",
"hash": "sha256:04rcnr7bgrqqfj62l31mxx553bjdalr5f46xjbcmvawgmj2wdqhk",
"lts": true
},
"6.17": {
"version": "6.17.11",
"hash": "sha256:0zi5mw6953iic9hwx78bjww81mcpb9y2sj5dgf819w9506pihjwk",
"version": "6.17.12",
"hash": "sha256:1mlqirjzyx3zvvm87gf7slj2d5gdpp13vw91dgbfk54iz6b08y22",
"lts": false
},
"6.18": {
"version": "6.18",
"hash": "sha256:0jzdvk3xdai1xsq0739hmf8rapw15dw5inarfvqizqx9bmha81li",
"version": "6.18.1",
"hash": "sha256:1m955svk1sfmhpw5wpkhg1dpnxmwsnpdqnivmw8alaniy3rqp9yh",
"lts": false
}
}
@@ -1,166 +0,0 @@
#!/usr/bin/env bash
# We're faking a `nix build` command-line to re-use Nix's own completion
# for the few options passed through to Nix.
_nixos-rebuild_pretend-nix() {
COMP_LINE="nix build ${COMP_LINE}"
# number of prepended chars
(( COMP_POINT = COMP_POINT + 10))
COMP_WORDS=(
nix build
"${COMP_WORDS[@]}"
)
# Add the amount of prepended words
(( COMP_CWORD = COMP_CWORD + 2))
_complete_nix "nix"
}
_nixos-rebuild() {
local curr="$2"
local prev="$3"
local subcommandGiven=0
local word
local subcommand
__load_completion nix
# Arrays are re-ordered by the completion, so it's fine to sort them in logical chunks
local all_args=(
--verbose -v
# nixos-rebuild options
--fast
--no-build-nix
--profile-name -p # name
--rollback
--specialisation -c # name
--sudo
--no-ssh-tty
--build-host # host
--target-host # host
# Used with list-generations
--json
# generation switching options
--install-bootloader
# nix-channel options
--upgrade
--upgrade-all
# flakes options
--commit-lock-file
--flake -F # flake-uri
--override-input # input-name flake-uri
--recreate-lock-file
--update-input
--no-flake
--no-registries
--no-update-lock-file
--no-write-lock-file
# Nix-copy options
--use-substitutes --substitute-on-destination -s
# Nix options
--option
--impure
--builders # builder-spec
--show-trace
--keep-failed -K
--keep-going -k
--max-jobs -j # number
--log-format # format
-I # NIX_PATH
)
local all_subcommands=(
boot
build
build-vm
build-vm-with-bootloader
dry-activate
dry-build
edit
list-generations
switch
test
)
# Suggest arguments that can be consumed under some conditions only
for word in "${COMP_WORDS[@]}"; do
for subcommand in "${all_subcommands[@]}"; do
if [[ "$word" == "$subcommand" ]]; then
subcommandGiven=1
fi
done
done
# Fake out a way to complete the second arg to some options
case "${COMP_WORDS[COMP_CWORD-2]}" in
"--override-input")
prev="--override-input_2"
;;
"--option")
prev="--option_2"
;;
esac
case "$prev" in
--max-jobs|-j)
COMPREPLY=( )
;;
--profile-name|-p)
if [[ "$curr" == "" ]]; then
COMPREPLY=( /nix/var/nix/profiles/* )
else
COMPREPLY=( "$curr"* )
fi
;;
--build-host|--target-host|-t|-h)
_known_hosts_real "$curr"
;;
--specialisation|-c)
COMPREPLY=()
;;
-I)
_nixos-rebuild_pretend-nix
;;
--builders)
_nixos-rebuild_pretend-nix
;;
--flake)
_nixos-rebuild_pretend-nix
;;
--override-input)
_nixos-rebuild_pretend-nix
;;
--override-input_2)
_nixos-rebuild_pretend-nix
;;
--log-format)
_nixos-rebuild_pretend-nix
;;
--option)
_nixos-rebuild_pretend-nix
;;
--option_2)
_nixos-rebuild_pretend-nix
;;
*)
if [[ "$curr" == -* ]] || (( subcommandGiven )); then
COMPREPLY=( $(compgen -W "${all_args[*]}" -- "$2") )
else
COMPREPLY=( $(compgen -W "${all_subcommands[*]}" -- "$2") )
fi
;;
esac
}
complete -F _nixos-rebuild nixos-rebuild

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