clean up imports

This commit is contained in:
Gene Liverman 2024-08-20 12:48:08 -04:00
parent 604706fb45
commit bcff4585ef
2 changed files with 37 additions and 85 deletions

114
flake.lock generated
View file

@ -41,11 +41,11 @@
"onchg": "onchg" "onchg": "onchg"
}, },
"locked": { "locked": {
"lastModified": 1723077491, "lastModified": 1723521594,
"narHash": "sha256-Zdv5L9Uhh84HTppHszAFvTAUzZfvHY+MTEcQwHc6dIk=", "narHash": "sha256-dMmOueX08665Ox6YrAODutCPJfz+BRFyCtq4RJFDZcs=",
"owner": "aksiksi", "owner": "aksiksi",
"repo": "compose2nix", "repo": "compose2nix",
"rev": "e5f35685dd09435f648ec827335ab307b7c4574d", "rev": "6e1a885f6142139182f28df68300ba33b9db0659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,15 +438,17 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": [
"nixpkgs"
],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723340593, "lastModified": 1723599342,
"narHash": "sha256-SYrNboypGpiFlE6g3UWdfqJeMihR0dBJPAwTwO6T64A=", "narHash": "sha256-4eUNZxze/tMkKzfAJSS+o3o4LcMH1znWfCUICO/Sw4A=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "94a1e5a4888ab0cb5ad0fe602d03d867a320348b", "rev": "5e861c29989be12691f90bda3a7b97891a629ed3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,21 +505,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_05": {
"locked": {
"lastModified": 1717144377,
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.05",
"type": "indirect"
}
},
"nixpkgs-bear": { "nixpkgs-bear": {
"locked": { "locked": {
"lastModified": 1705957679, "lastModified": 1705957679,
@ -578,38 +565,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1722987190,
"narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1721524707,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-terraform": { "nixpkgs-terraform": {
"inputs": { "inputs": {
"config": "config", "config": "config",
@ -639,11 +594,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1723221148, "lastModified": 1723603349,
"narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -684,11 +639,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1723282977, "lastModified": 1723556749,
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -698,21 +653,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"onchg": { "onchg": {
"inputs": { "inputs": {
"nix-pre-commit": "nix-pre-commit", "nix-pre-commit": "nix-pre-commit",
@ -804,11 +744,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723256423, "lastModified": 1723515680,
"narHash": "sha256-9iDTrfVM+mbcad31a47oqW8t8tfSA4C/si6F8F2DO/w=", "narHash": "sha256-nHdKymsHCVIh0Wdm4MvSgxcTTg34FJIYHRQkQYaSuvk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "615cfd85b4d9c51811a8d875374268fab5bd4089", "rev": "4ee3d9e9569f70d7bb40f28804d6fe950c81eab3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -821,8 +761,12 @@
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_5", "nixpkgs": [
"nixpkgs-24_05": "nixpkgs-24_05", "nixpkgs"
],
"nixpkgs-24_05": [
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -845,14 +789,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1723454404, "lastModified": 1723501126,
"narHash": "sha256-Zhcf1TMDYb0BxDHKhEKCKFb1qi2vwlX0BgJPwk9Gd3E=", "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ab2d1ffeb5b85da2f6537beb2fe05da54276c261", "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -48,6 +48,7 @@
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs-stable.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -59,12 +60,17 @@
inputs.nixpkgs-1_9.follows = "nixpkgs-unstable"; inputs.nixpkgs-1_9.follows = "nixpkgs-unstable";
}; };
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
inputs.nixpkgs-24_05.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
# Secrets managemnt # Secrets managemnt
sops-nix = { sops-nix = {
url = "github:mic92/sops-nix"; url = "github:mic92/sops-nix";
inputs.nixpkgs.follows ="nixpkgs"; inputs.nixpkgs.follows ="nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
}; # end inputs }; # end inputs