Merge branch 'main' into b12f

This commit is contained in:
Benjamin Bädorf 2022-03-29 19:33:06 +02:00
commit 09bc8d5295
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C

View file

@ -87,11 +87,11 @@
]
},
"locked": {
"lastModified": 1647173930,
"narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=",
"lastModified": 1648278671,
"narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "17fbc68a6110edbff67e55f7450230a697ecb17e",
"rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79",
"type": "github"
},
"original": {
@ -109,11 +109,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1643787431,
"narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
"lastModified": 1648475189,
"narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
"rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
"type": "github"
},
"original": {
@ -156,14 +156,15 @@
"nixos-generators": "nixos-generators",
"nixpkgs": [
"nixos"
]
],
"std": "std"
},
"locked": {
"lastModified": 1646846683,
"narHash": "sha256-s13XKw1xjGlmdY9qMwla/mDKaE/8xAVJ/+ZTJ9Q7CTY=",
"lastModified": 1648424601,
"narHash": "sha256-cSDiq0PMKPLIzFC05RZccEL/8CbebljN19dO2HNLWBk=",
"owner": "divnix",
"repo": "digga",
"rev": "396b04b62b885963c467aa8ade3c19398ade2d69",
"rev": "9da3840a6f4c86c3058f8bd2e1d824dbee2abdfe",
"type": "github"
},
"original": {
@ -175,11 +176,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github"
},
"original": {
@ -237,7 +238,7 @@
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils_3"
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1639385028,
@ -254,21 +255,6 @@
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
@ -283,7 +269,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -298,7 +284,7 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_4": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
@ -352,11 +338,11 @@
},
"latest_2": {
"locked": {
"lastModified": 1647800324,
"narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=",
"lastModified": 1648390671,
"narHash": "sha256-u69opCeHUx3CsdIerD0wVSR+DjfDQjnztObqfk9Trqc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e",
"rev": "ce8cbe3c01fd8ee2de526ccd84bbf9b82397a510",
"type": "github"
},
"original": {
@ -373,11 +359,11 @@
]
},
"locked": {
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"lastModified": 1648544490,
"narHash": "sha256-EoBDcccV70tfz2LAs5lK0BjC7en5mzUVlgLsd5E6DW4=",
"owner": "nmattia",
"repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"rev": "e30ef9a5ce9b3de8bb438f15829c50f9525ca730",
"type": "github"
},
"original": {
@ -388,7 +374,7 @@
},
"nix-dram": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"latest"
]
@ -424,11 +410,11 @@
},
"nixos": {
"locked": {
"lastModified": 1647992509,
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
"lastModified": 1648553562,
"narHash": "sha256-xQhRKu6h0phd56oCzGjkhHkY4eDI1XKedGqkFtlXapk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
"rev": "9b168e5e62406fa2e55e132f390379a6ba22b402",
"type": "github"
},
"original": {
@ -441,7 +427,10 @@
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"digga",
"blank"
]
},
"locked": {
"lastModified": 1637655461,
@ -459,11 +448,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1648022149,
"narHash": "sha256-xhDjF807UZwC2I6EGYrH1o8Mzr6w8bBruGOmHAcWO/Q=",
"lastModified": 1648141026,
"narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "a352d867273cf4a245d890f8a2cfcfabd29c5c63",
"rev": "feceb4d24f582817d8f6e737cd40af9e162dee05",
"type": "github"
},
"original": {
@ -490,30 +479,15 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1646943458,
"narHash": "sha256-qgGBWULyReIEdRg/k52Tv4Eognyk8S9360oxem+1qFY=",
"owner": "NixOS",
"lastModified": 1647350163,
"narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b3b026509758cebbaa4e3173c1f1531102b28b64",
"rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1646506091,
"narHash": "sha256-sWNAJE2m+HOh1jtXlHcnhxsj6/sXrHgbqVNcVRlveK4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e644bd62489b516292c816f70bf0052c693b3c7",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
@ -535,17 +509,17 @@
"nvfetcher": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1644123018,
"narHash": "sha256-xEhhLmuy4FnT4Zdkf3epPX9T3xqn59yERCsicG4IEyM=",
"lastModified": 1648145722,
"narHash": "sha256-iC04ukXdms4XnvKh/o1LoYXDiAURD6y0vae8V6ovQfw=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "9f2cb15c4668859312b6a854d79ad753d5b98b03",
"rev": "daea67a8b6ec8aa89eb3a474c3d9e9ce2b2cc6f1",
"type": "github"
},
"original": {
@ -556,8 +530,16 @@
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
"flake-utils": [
"bud",
"beautysh",
"flake-utils"
],
"nixpkgs": [
"bud",
"beautysh",
"nixpkgs"
]
},
"locked": {
"lastModified": 1633382856,
@ -590,13 +572,32 @@
"nvfetcher": "nvfetcher"
}
},
"std": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"yants": "yants"
},
"locked": {
"lastModified": 1647235919,
"narHash": "sha256-fO4dlRO0zeZtzY1QF7iLatx81jena6QP7HZEA83AJ8E=",
"owner": "divnix",
"repo": "std",
"rev": "133fb0c1cc8d0d477a3d339971ef09fa57a60fd3",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "std",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"lastModified": 1648297722,
"narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github"
},
"original": {
@ -604,6 +605,28 @@
"repo": "flake-utils",
"type": "github"
}
},
"yants": {
"inputs": {
"nixpkgs": [
"digga",
"std",
"nixpkgs"
]
},
"locked": {
"lastModified": 1645126146,
"narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=",
"owner": "divnix",
"repo": "yants",
"rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc",
"type": "github"
},
"original": {
"owner": "divnix",
"repo": "yants",
"type": "github"
}
}
},
"root": "root",