From 9c5d075b4bf3bcc27038a3ba1f1f587dd60d0c74 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sat, 28 May 2022 12:31:11 -0400 Subject: [PATCH] Move to 22.05 branch --- flake.lock | 240 ++++++++++++++++++++++++++--------------------------- flake.nix | 6 +- 2 files changed, 120 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 6f3e71b..0cadde8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1650976225, - "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=", + "lastModified": 1651916036, + "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0", + "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1632822684, - "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=", + "lastModified": 1653594315, + "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", "owner": "Serokell", "repo": "deploy-rs", - "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4", + "rev": "184349d8149436748986d1bdba087e4149e9c160", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -79,30 +79,33 @@ ] }, "locked": { - "lastModified": 1651519540, - "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "lastModified": 1653518057, + "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "rev": "64831f938bd413cefde0b0cf871febc494afaa4f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "rnix-lsp", + "nixpkgs" + ] }, "locked": { - "lastModified": 1635444951, - "narHash": "sha256-1y3YkERwoYDIZjGow7HLAR8K3C/9VBPCBy8VpftMPsM=", + "lastModified": 1639947939, + "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", "owner": "nix-community", "repo": "naersk", - "rev": "0d2ce479df4633dbeb53a8ea96e5098ed37fbcc6", + "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", "type": "github" }, "original": { @@ -112,24 +115,6 @@ } }, "naersk_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1650265945, - "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=", - "owner": "nmattia", - "repo": "naersk", - "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df", - "type": "github" - }, - "original": { - "owner": "nmattia", - "repo": "naersk", - "type": "github" - } - }, - "naersk_3": { "inputs": { "nixpkgs": [ "youmubot", @@ -152,14 +137,16 @@ }, "nix-gaming": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1650903776, - "narHash": "sha256-6OWA4R9trOSkmSdsJXslYlQ+VklCIOLpZKfNTtrXHNg=", + "lastModified": 1653318398, + "narHash": "sha256-N3auZyUz96KrNCGKrZE0bhW0qn6n1xBckUrrPhqHy40=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "448bce69b5713a3da870c77bbd6610e4c5fca2a8", + "rev": "36deeca89ce14f27ef5038a83d4e61272bc111ef", "type": "github" }, "original": { @@ -170,11 +157,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632086102, - "narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e0ce3c683ae677cf5aab597d645520cddd13392b", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { @@ -184,13 +171,45 @@ "type": "github" } }, + "nixpkgs-21_11": { + "locked": { + "lastModified": 1653132211, + "narHash": "sha256-5ugEYisGqixwarfn3BJvuWDnO6gT/AoxlsA6jnG8Fv8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b5991e4971523a5fcc9413b9003b58e5c15aa7d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-22_05": { + "locked": { + "lastModified": 1653460991, + "narHash": "sha256-8MgFe84UUKw5k5MybirNH0S+oSluN2cRQGt+ZkW+dxQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0c3bf3a5c3ab6be29138b88900c417660a284fbd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1651024496, - "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=", + "lastModified": 1653738054, + "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf", + "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", "type": "github" }, "original": { @@ -200,71 +219,44 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable_2": { "locked": { - "lastModified": 1635527206, - "narHash": "sha256-vuktnugcLNX5HFpj8nVSKgojRDYQlxtKtcYWtOveegE=", - "owner": "NixOS", + "lastModified": 1651773324, + "narHash": "sha256-+tzXzgZQMCxacRmEDRjdbYulorD40BI+YK6aWBwgCcM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "7565e8eb3278125807f7f7abafcd3232f77746d9", + "rev": "a1439bc96590dae913369f4515ca3df6ca1a1556", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1653504306, + "narHash": "sha256-bqjEskV+/tqOQqSEaCu4e6uWZ0F7ekBiMR16xpn4V0k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6efc186e6079ff3f328a2497ff3d36741ac60f6e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1650899852, - "narHash": "sha256-FNgHYq0LtGhvq1CniCg1RaH9Ngr7svm9iR6loPWCCNs=", + "lastModified": 1653058418, + "narHash": "sha256-rr+NP3ak+BU1tBye27jPIp2OrOr/742wNPdVqyHeB4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecc66a886eb7eec1d671ddfce2a0cccd12bc4807", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1650921206, - "narHash": "sha256-RGlfTC2ktqLVw0gBvZeCM//B4ig2CdQJm39sDvm0DBQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3a9e0f239d80fa134e8fcbdee4dfc793902da37e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1649490789, - "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=", - "path": "/nix/store/al07yz345ymvsncz3dsmayd27dx7sfgc-source", - "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1625223284, - "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "357d2c8f6087685fe35cb1889a005a4dd4cce7b8", + "rev": "f2db28ca7cca3f0e8ff74b65c5326f0dc0483288", "type": "github" }, "original": { @@ -276,11 +268,11 @@ }, "nur": { "locked": { - "lastModified": 1648466133, - "narHash": "sha256-IWNdsb4vcrP5eUAq4QOC3nNhlpMvCNhJnNcKQlMQyq0=", + "lastModified": 1653744184, + "narHash": "sha256-YzM0ldFW0OtxDOBgCJ7PBTL+NVRLi6SHy2m9U2gDTvw=", "owner": "nix-community", "repo": "NUR", - "rev": "dff41b1dd6beb826a3f6c709b55590012d429bda", + "rev": "b6ad2a66f383a92b67f760e63c6fd3c63557e5ef", "type": "github" }, "original": { @@ -291,18 +283,18 @@ }, "rnix-lsp": { "inputs": { - "naersk": "naersk_2", + "naersk": "naersk", "nixpkgs": [ "nixpkgs-unstable" ], "utils": "utils_2" }, "locked": { - "lastModified": 1634449716, - "narHash": "sha256-JuRCU4KCIA3/pp8BjHqqF9dj1d2xtpkxKKAtSuOzTIY=", + "lastModified": 1651229115, + "narHash": "sha256-ic9hnLq3f7KIpr0uJXptHOImPv4CqznTE9yBM/LCiko=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "a2d06d2d2910cbe35b4f323a54ef484f51d71e20", + "rev": "9736265eb4fd4d1488b34b229ad1ab589610740e", "type": "github" }, "original": { @@ -316,9 +308,8 @@ "darwin": "darwin", "deploy-rs": "deploy-rs", "home-manager": "home-manager", - "naersk": "naersk", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rnix-lsp": "rnix-lsp", @@ -344,14 +335,16 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_3", + "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1633273832, - "narHash": "sha256-oOjpMVYpkIUpiML61PeqTk+sg4juRvF7P6jroI/YvTw=", + "lastModified": 1653462763, + "narHash": "sha256-n0beO7WNvAeEtTtnetzQCaGs615tU/DfM97k8r/7bUw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c", + "rev": "7385b12722ce903e477878147794bed9040227e2", "type": "github" }, "original": { @@ -362,11 +355,11 @@ }, "utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -377,11 +370,11 @@ }, "utils_2": { "locked": { - "lastModified": 1629481132, - "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -393,17 +386,18 @@ "youmubot": { "inputs": { "flake-utils": "flake-utils", - "naersk": "naersk_3", + "naersk": "naersk_2", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-unstable": "nixpkgs-unstable_2" }, "locked": { - "lastModified": 1651276856, - "narHash": "sha256-76WjeAAFEas3EeJUphc5UXbB6L3NulZQEq3Z2hLw8Vc=", + "lastModified": 1651774715, + "narHash": "sha256-WznLNfe4o91YWZCNiwUSMfbaNKu+s6eHJpqpsobSJ+w=", "owner": "natsukagami", "repo": "youmubot", - "rev": "431c67e14ca89f8c897f737c4b6e5e3e7db8c367", + "rev": "0663d34cce5f1f8b1e0094a78814c2c87bd4e7d0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f547431..9039b53 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "nki's systems"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; - home-manager.url = "github:nix-community/home-manager/release-21.11"; + home-manager.url = "github:nix-community/home-manager/release-22.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; deploy-rs.url = "github:Serokell/deploy-rs"; @@ -14,12 +14,12 @@ # --- # Imported apps - naersk.url = "github:nix-community/naersk"; rnix-lsp.url = "github:nix-community/rnix-lsp"; rnix-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable"; youmubot.url = "github:natsukagami/youmubot"; youmubot.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = github:fufexan/nix-gaming; + nix-gaming.inputs.nixpkgs.follows = "nixpkgs"; # --- # DEPLOYMENT ONLY! secrets