Merge master into staging-next
This commit is contained in:
+2
-2
@@ -10,14 +10,14 @@ nix-build ci -A eval.baseline
|
||||
|
||||
The two most important arguments are:
|
||||
- `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
|
||||
Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
|
||||
Defaults to the [supported systems](../../pkgs/top-level/release-supported-systems.json) for the branch.
|
||||
Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`
|
||||
- `--arg quickTest`: Enables testing a single chunk of the current system only for quick iteration.
|
||||
Example: `--arg quickTest true`
|
||||
|
||||
The following arguments can be used to fine-tune performance:
|
||||
- `--max-jobs`: The maximum number of derivations to run at the same time.
|
||||
Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
|
||||
Only each supported system gets a separate derivation, so it doesn't make sense to set this higher than that number.
|
||||
- `--cores`: The number of cores to use for each job.
|
||||
Recommended to set this to the number of cores on your system divided by `--max-jobs`.
|
||||
- `--arg chunkSize`: The number of attributes that are evaluated simultaneously on a single core.
|
||||
|
||||
+3
-2
@@ -38,7 +38,6 @@ let
|
||||
fileset = unions (
|
||||
map (lib.path.append ../..) [
|
||||
".version"
|
||||
"ci/supportedSystems.json"
|
||||
"ci/eval/attrpaths.nix"
|
||||
"ci/eval/chunk.nix"
|
||||
"ci/eval/outpaths.nix"
|
||||
@@ -53,7 +52,9 @@ let
|
||||
);
|
||||
};
|
||||
|
||||
supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
|
||||
supportedSystems = builtins.fromJSON (
|
||||
builtins.readFile ../../pkgs/top-level/release-supported-systems.json
|
||||
);
|
||||
|
||||
attrpathsSuperset =
|
||||
{
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
attrNamesOnly ? false,
|
||||
|
||||
# Set this to `null` to build for builtins.currentSystem only
|
||||
systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),
|
||||
systems ? builtins.fromJSON (
|
||||
builtins.readFile (path + "/pkgs/top-level/release-supported-systems.json")
|
||||
),
|
||||
|
||||
# Customize the config used to evaluate nixpkgs
|
||||
extraNixpkgsConfig ? { },
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dprint";
|
||||
version = "0.51.1";
|
||||
version = "0.52.0";
|
||||
|
||||
# Prefer repository rather than crate here
|
||||
# - They have Cargo.lock in the repository
|
||||
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "dprint";
|
||||
repo = "dprint";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jj9SsVWCw2Fzoj1ome2rJ9bADFgREUdQf0jfOpt8PkU=";
|
||||
hash = "sha256-IVqHaqpoMXM1xHFCyh1lbRjKQbt7ZuX4u9Q9AoWOyWU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zjk2LrljubzfNk20y4XTcnqiQQsBlc2aRwAhH8wpv3Q=";
|
||||
cargoHash = "sha256-eLIkzAWt/7G73Fr2EXdVTYFd2QXqaYJvMM8SrKowbmU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
let
|
||||
pname = "mongodb-compass";
|
||||
version = "1.49.1";
|
||||
version = "1.49.2";
|
||||
|
||||
selectSystem =
|
||||
attrs:
|
||||
@@ -67,9 +67,9 @@ let
|
||||
}
|
||||
}";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-6wjwV6KViRJiJiS+Cc3+sjLjKm/K7dGHUHAx9u5Rngk=";
|
||||
x86_64-darwin = "sha256-v4lxvKMcLabMfshpBD4PqCXcyf/cJz+kn6qKIfLruNc=";
|
||||
aarch64-darwin = "sha256-7FmRgA+5qHUiozGGlzGM/gWffzcpHwiOY52yGKvH5GY=";
|
||||
x86_64-linux = "sha256-O3GD06eqONIE13vY+6s1CfZ1+9c88/YeGS5wVtRdNxo=";
|
||||
x86_64-darwin = "sha256-UOrSYKLaUByOQXhhsKrgelvS3XlHSFW34KwjGfZyW6k=";
|
||||
aarch64-darwin = "sha256-Zcq9DZFTmfTmroNWToxUYpipZzBDe8Ph8xy4j3OiCa8=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -91,6 +92,11 @@ buildGoModule (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
# package is marked as broken on darwin, because due to upgrades to the
|
||||
# darwin clang compiler the native node-addon-api cannot be built anymore.
|
||||
# this can only be fixed by upstream upgrading dependencies (especially
|
||||
# node-gyp and node-addon-api).
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://paisa.fyi/";
|
||||
changelog = "https://github.com/ananthakumaran/paisa/releases/tag/v${finalAttrs.version}";
|
||||
description = "Personal finance manager, building on top of the ledger double entry accounting tool";
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "robiot";
|
||||
repo = "xclicker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zVbOfqh21+/41N3FcAFajcZCrQ8iNqedZjgNQO0Zj04=";
|
||||
};
|
||||
|
||||
@@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
install -Dm755 ./src/xclicker $out/bin/xclicker
|
||||
install -Dm644 $src/assets/xclicker.desktop $out/share/applications/xclicker.desktop
|
||||
install -Dm644 $src/assets/icon.png $out/share/pixmaps/xclicker.png
|
||||
install -Dm644 $src/assets/icon.png $out/share/icons/hicolor/256x256/apps/xclicker.png
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/robiot/xclicker/releases/tag/${finalAttrs.src.rev}";
|
||||
changelog = "https://github.com/robiot/xclicker/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "Fast gui autoclicker for x11 linux desktops";
|
||||
homepage = "https://xclicker.xyz/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "yaookctl";
|
||||
version = "0-unstable-2026-02-05";
|
||||
version = "0-unstable-2026-02-25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "yaook";
|
||||
repo = "yaookctl";
|
||||
rev = "c0e3f92cbf15fdf985ac7dba9ed9edb320bda8f1";
|
||||
hash = "sha256-TUAKHK/kxQHFpOGYP56lv4PmnfpkXFUY60BBZusV7b8=";
|
||||
rev = "60758d872c6444a840de1263f94418ddc91a7005";
|
||||
hash = "sha256-f9pIY0/Be0zBb0flTT16e/4HzMwiJb557FqyMW9Q0rc=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
|
||||
*/
|
||||
{
|
||||
supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
|
||||
supportedSystems ? builtins.fromJSON (builtins.readFile ./release-supported-systems.json),
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -12,12 +12,7 @@
|
||||
revision = "0000000000000000000000000000000000000000";
|
||||
},
|
||||
# The platform doubles for which we build Nixpkgs.
|
||||
supportedSystems ? [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
],
|
||||
supportedSystems ? builtins.fromJSON (builtins.readFile ./release-supported-systems.json),
|
||||
# Attributes passed to nixpkgs. Don't build packages marked as unfree.
|
||||
nixpkgsArgs ? {
|
||||
config = {
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
[
|
||||
"aarch64-linux",
|
||||
"aarch64-darwin",
|
||||
"x86_64-linux",
|
||||
"x86_64-darwin"
|
||||
]
|
||||
@@ -19,7 +19,7 @@
|
||||
system ? builtins.currentSystem,
|
||||
officialRelease ? false,
|
||||
# The platform doubles for which we build Nixpkgs.
|
||||
supportedSystems ? builtins.fromJSON (builtins.readFile ../../ci/supportedSystems.json),
|
||||
supportedSystems ? builtins.fromJSON (builtins.readFile ./release-supported-systems.json),
|
||||
# The platform triples for which we build bootstrap tools.
|
||||
bootstrapConfigs ? [
|
||||
"arm64-apple-darwin"
|
||||
|
||||
Reference in New Issue
Block a user