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 24 additions and 0 deletions
Showing only changes of commit dfd80c0e95 - Show all commits

View file

@ -197,6 +197,22 @@
"type": "github" "type": "github"
} }
}, },
"fork": {
"locked": {
"lastModified": 1692960587,
"narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=",
"owner": "teutat3s",
"repo": "nixpkgs",
"rev": "312709dd70684f52496580e533d58645526b1c90",
"type": "github"
},
"original": {
"owner": "teutat3s",
"ref": "nvfetcher-fix",
"repo": "nixpkgs",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -288,6 +304,7 @@
"deploy": "deploy", "deploy": "deploy",
"digga": "digga", "digga": "digga",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"fork": "fork",
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"nixos": "nixos", "nixos": "nixos",

View file

@ -8,6 +8,8 @@
nixos.url = "github:nixos/nixpkgs/nixos-23.05"; nixos.url = "github:nixos/nixpkgs/nixos-23.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;
@ -69,6 +71,7 @@
]; ];
}; };
latest = {}; latest = {};
fork = {};
}; };
lib = import ./lib {lib = digga.lib // nixos.lib;}; lib = import ./lib {lib = digga.lib // nixos.lib;};

View file

@ -4,6 +4,10 @@ channels: final: prev: {
inherit inherit
(channels.latest) (channels.latest)
nixd nixd
;
inherit
(channels.fork)
nvfetcher nvfetcher
; ;