diff --git a/flake.lock b/flake.lock index 451307b2..f7f7fe5d 100644 --- a/flake.lock +++ b/flake.lock @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1673948101, - "narHash": "sha256-cD0OzFfnLFeeaz4jVszH9QiMTn+PBxmcYzrp+xujpwM=", + "lastModified": 1674041176, + "narHash": "sha256-cMf1BQzI39nHQ0H/mOatthbbI3392qLmJ9gU0u520P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd3efacb82c721edad1ce9eda583df5fb62ab00a", + "rev": "2c29ae48f9a149151bdd82f429ac61d4412c312a", "type": "github" }, "original": { @@ -227,7 +227,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", + "nixpkgs-22_11": [ + "nixpkgs-22_11" + ], "utils": [ "flake-utils" ] @@ -248,11 +250,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673631141, - "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=", + "lastModified": 1673796341, + "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "befc83905c965adfd33e5cae49acb0351f6e0404", + "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "type": "github" }, "original": { @@ -264,26 +266,27 @@ }, "nixpkgs-22_11": { "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixos-22.11", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nur": { "locked": { - "lastModified": 1674021312, - "narHash": "sha256-kW00Hpb2jqX7zDHnw/us7DH4lChTa6DoVcZZrd9CKwE=", + "lastModified": 1674056681, + "narHash": "sha256-CS0CwyFk3FYK6QTNuVJFjqZGg5qo5FuvrcNHwJE31ww=", "owner": "nix-community", "repo": "NUR", - "rev": "993b34d7fc525534c59229312c1ff21a976def54", + "rev": "ca61de8ba6f480b688a05b505c24495e88a4eb76", "type": "github" }, "original": { @@ -304,6 +307,7 @@ "home-manager": "home-manager", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", + "nixpkgs-22_11": "nixpkgs-22_11", "nur": "nur", "tetris": "tetris", "utils": "utils", diff --git a/flake.nix b/flake.nix index 0a380df9..e085c547 100644 --- a/flake.nix +++ b/flake.nix @@ -58,10 +58,12 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs = { nixpkgs.follows = "nixpkgs"; + nixpkgs-22_11.follows = "nixpkgs-22_11"; utils.follows = "flake-utils"; }; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-22_11.url = "github:nixos/nixpkgs/nixos-22.11"; nur.url = "github:nix-community/NUR"; tetris = { url = "github:chvp/tetris"; @@ -87,7 +89,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }: + outputs = inputs@{ self, nixpkgs, nixpkgs-22_11, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }: utils.lib.mkFlake { inherit self inputs; channels.nixpkgs = { @@ -100,6 +102,7 @@ (self: super: { tetris = tetris.packages.${self.system}.default; udp2raw = self.callPackage ./packages/udp2raw { }; + mastodon = nixpkgs-22_11.legacyPackages.${self.system}.mastodon; }) nur.overlay www-chvp-be.overlay