Merged with upstream (lock conflict)

This commit is contained in:
niten 2021-12-01 09:18:10 -08:00
commit 9a3e8eefa2

30
flake.lock generated
View File

@ -215,11 +215,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1638122382,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638317485, "lastModified": 1638377832,
"narHash": "sha256-L/lOrVjZAqwoC/gw/9BGdSK1YK0/Sl7VorBJgOd4gGk=", "narHash": "sha256-MWZ5h1kdQQbYhr5FqgWkGJpXJhvz9cX6ZyNCXj/usYE=",
"ref": "master", "ref": "master",
"rev": "3dfcf3985223782c798fe5aab33d89e2eb78c370", "rev": "067392bc5f3f38028d7a11e97eefe36164e67fa7",
"revCount": 9, "revCount": 12,
"type": "git", "type": "git",
"url": "https://git.fudo.org/fudo-nix/entities.git" "url": "https://git.fudo.org/fudo-nix/entities.git"
}, },
@ -290,13 +290,17 @@
}, },
"fudo-lib": { "fudo-lib": {
"locked": { "locked": {
"narHash": "sha256-r8qffvJPWbBJmN32thMIxjdmY9X5VCc3TuyQyFAIdks=", "lastModified": 1638315265,
"path": "/state/fudo-lib", "narHash": "sha256-MoGnuM10hxHehr0TcmG5ssRfj3Xun7xPCVuHFy6yfjo=",
"type": "path" "ref": "master",
"rev": "976d47cf2d723bf8aefb32780311faf75164abe3",
"revCount": 21,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git"
}, },
"original": { "original": {
"path": "/state/fudo-lib", "type": "git",
"type": "path" "url": "https://git.fudo.org/fudo-nix/lib.git"
} }
}, },
"fudo-lib_2": { "fudo-lib_2": {
@ -342,7 +346,7 @@
"ssh-keypairs": "ssh-keypairs" "ssh-keypairs": "ssh-keypairs"
}, },
"locked": { "locked": {
"narHash": "sha256-Q89s52d8KAMIbxh7aBoUwUTFAbgUBE5IaAIwd267k20=", "narHash": "sha256-UySPZk4j9Wj6Rw2919wYaHkA4P2LV8MAHR4uPqxAEV4=",
"path": "/state/secrets", "path": "/state/secrets",
"type": "path" "type": "path"
}, },