diff --git a/config/workarounds/default.nix b/config/workarounds/default.nix index fffbd0ec..f054b099 100644 --- a/config/workarounds/default.nix +++ b/config/workarounds/default.nix @@ -1,9 +1,11 @@ { self, + nix-packages, system, ... }: { nixpkgs.overlays = [ self.overlays.${system} + nix-packages.overlays.${system}.default ]; } diff --git a/flake.lock b/flake.lock index 3b6180dd..10df5c1f 100644 --- a/flake.lock +++ b/flake.lock @@ -1104,6 +1104,30 @@ "hydra_2": { "inputs": { "nix": "nix_2", + "nixpkgs": [ + "nix-packages", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1679916613, + "narHash": "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0=", + "owner": "NixOS", + "repo": "hydra", + "rev": "082495e34e094cae1eb49dbfc5648938e23c6355", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "hydra", + "type": "github" + } + }, + "hydra_3": { + "inputs": { + "nix": "nix_3", "nixpkgs": [ "nixos-config-for-netboot", "hydra", @@ -1189,6 +1213,22 @@ "type": "github" } }, + "lowdown-src_3": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "mautrix-cleanup": { "inputs": { "flake-utils": [ @@ -1292,20 +1332,18 @@ "flake-utils" ], "gomod2nix": "gomod2nix", - "hydra": [ - "hydra" - ], + "hydra": "hydra_2", "mautrix-cleanup": "mautrix-cleanup", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682148646, - "narHash": "sha256-TCcGQyIbTsIARPWntdSoHSJQA0wEAjxkZfvdbDZC0pM=", + "lastModified": 1682177218, + "narHash": "sha256-wsl5uY1NbD7MQpeSAPkuLzrElHLktZnQEbLGl5oRf8M=", "ref": "main", - "rev": "1b8ce7f271ac890b5aa14b7eb828311dfb55334c", - "revCount": 724, + "rev": "b0ad8a79713ee8231a250ae13997e78ab763631d", + "revCount": 729, "type": "git", "url": "https://git.chir.rs/darkkirb/nix-packages.git" }, @@ -1349,6 +1387,27 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression_2" }, + "locked": { + "lastModified": 1677045134, + "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", + "owner": "nixos", + "repo": "nix", + "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "2.13.3", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_3", + "nixpkgs-regression": "nixpkgs-regression_3" + }, "locked": { "lastModified": 1661606874, "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", @@ -1377,10 +1436,10 @@ "haskell-flake": "haskell-flake_2", "home-manager": "home-manager_2", "hosts-list": "hosts-list_2", - "hydra": "hydra_2", + "hydra": "hydra_3", "nix-packages": "nix-packages_2", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-for-crane": "nixpkgs-for-crane", "nixpkgs-noto-variable": "nixpkgs-noto-variable", "nur": "nur", @@ -1576,6 +1635,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1675327819, @@ -1625,6 +1700,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -1640,7 +1731,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1679207639, "narHash": "sha256-4cz3EmZfuYd8BzW1FrSP7Ihb6xzqmz5P7r3EGj0ob5o=", @@ -1655,7 +1746,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1682137720, "narHash": "sha256-DKMa1doj4CMCJzhzU+G1pAODymlpjTGoLohdaMJ+6Lg=", @@ -1825,7 +1916,7 @@ "nix-packages": "nix-packages", "nixos-config-for-netboot": "nixos-config-for-netboot", "nixos-hardware": "nixos-hardware_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-for-crane": "nixpkgs-for-crane_2", "nixpkgs-noto-variable": "nixpkgs-noto-variable_2", "nur": "nur_2", diff --git a/flake.nix b/flake.nix index 28c132ce..4b1e9d35 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ rec { inputs.attic.follows = "attic"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.hydra.follows = "hydra"; +# inputs.hydra.follows = "hydra"; }; nixos-config-for-netboot.url = "github:DarkKirb/nixos-config/c9c3d16b23042a25f504a6d71e7075318f1137f8"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/overlays/default.nix b/overlays/default.nix index 1276929a..95f468df 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -58,6 +58,7 @@ in }; hydra-unsstable = nix-packages.packages.${system}.hydra.overrideAttrs (super: { doCheck = false; + checkPhase = ""; + installCheckPhase = ""; }); } - // nix-packages.packages.${system}