chore: merge main into infra #255

Merged
b12f merged 18 commits from chore/infra-merge-main into infra 2023-09-13 11:29:20 +00:00
3 changed files with 2 additions and 65 deletions
Showing only changes of commit 2d27b9c315 - Show all commits

View file

@ -197,24 +197,6 @@
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1687171271,
"narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home": {
"inputs": {
"nixpkgs": [
@ -299,30 +281,6 @@
"type": "github"
}
},
"nvfetcher": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1687440270,
"narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "44196458acc2c28c32e456c50277d6148e71e708",
"type": "github"
},
"original": {
"owner": "berberman",
"repo": "nvfetcher",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -333,23 +291,7 @@
"home": "home",
"latest": "latest",
"nixos": "nixos",
"nixos-hardware": "nixos-hardware",
"nvfetcher": "nvfetcher"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
"nixos-hardware": "nixos-hardware"
}
},
"utils": {

View file

@ -34,10 +34,6 @@
agenix.inputs.darwin.follows = "darwin";
nixos-hardware.url = "github:nixos/nixos-hardware";
nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "nixos";
nvfetcher.inputs.flake-compat.follows = "flake-compat";
};
outputs = {
@ -48,7 +44,6 @@
nixos-hardware,
agenix,
deploy,
nvfetcher,
...
} @ inputs:
digga.lib.mkFlake
@ -86,7 +81,6 @@
});
})
agenix.overlays.default
nvfetcher.overlays.default
(import ./pkgs)
];

View file

@ -4,6 +4,7 @@ channels: final: prev: {
inherit
(channels.latest)
nixd
nvfetcher
;
haskellPackages =