ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-11 07:15:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #297392 from Mindavi/hydra/2024-03-08

Browse Source 
hydra_unstable: 2023-12-24 -> 2024-03-08, use nix_2_20
This commit is contained in:
Rick van Schijndel 2024-04-03 20:59:45 +02:00 committed by GitHub
commit 2600c7f38c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/tests/hydra/common.nix
View File

@ -36,13 +36,6 @@
'';
};
services.postfix.enable = true;
nix = {
distributedBuilds = true;
buildMachines = [{
hostName = "localhost";
systems = [ system ];
}];
settings.substituters = [];
};
nix.settings.substituters = [];
};
}

6
pkgs/development/tools/misc/hydra/unstable.nix
View File

@ -123,13 +123,13 @@ let
in
stdenv.mkDerivation rec {
pname = "hydra";
version = "2023-12-24";
version = "2024-03-08";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "02e453fc8c39751843220eaecdeaf7d539b7e765";
hash = "sha256-hIXRgu2MGqFYCALDKAiP+8lE859zftRe4OVIgGOTkvc=";
rev = "8f56209bd6f3b9ec53d50a23812a800dee7a1969";
hash = "sha256-mhEj02VruXPmxz3jsKHMov2ERNXk9DwaTAunWEO1iIQ=";
};
buildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -21677,7 +21677,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc { };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_19; };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_20; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };