From f7d4255a341be8fdec89a148b370aefef72d90e1 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 23 Jun 2024 21:20:02 +0200 Subject: [PATCH] pastila: use poezio from nixpkgs-unstable --- flake.lock | 17 +++++++++++++++++ flake.nix | 11 ++++++----- pastila/configuration.nix | 13 +++++++++++-- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index cacdb0f..ac39fd2 100644 --- a/flake.lock +++ b/flake.lock @@ -56,6 +56,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1718419000, @@ -118,6 +134,7 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "paste-py": "paste-py" } }, diff --git a/flake.nix b/flake.nix index 8972f5b..560306d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,31 @@ { inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.paste-py.url = "git+https://github.com/Armael/paste-py?rev=fd4b051067a09b1f76df5516514330e0d53398f7"; inputs.paste-py.inputs.nixpkgs.follows = "nixpkgs"; - outputs = { self, nixpkgs, ... }@attrs: { + outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations."oven" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; + specialArgs = inputs; modules = [ ./oven/configuration.nix ]; }; nixosConfigurations."pastila" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; + specialArgs = inputs; modules = [ ./pastila/configuration.nix ]; }; nixosConfigurations."mesange" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; + specialArgs = inputs; modules = [ ./mesange/configuration.nix ]; }; nixosConfigurations."pinson" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; + specialArgs = inputs; modules = [ ./pinson/configuration.nix ]; }; }; diff --git a/pastila/configuration.nix b/pastila/configuration.nix index ce4994f..4fad267 100644 --- a/pastila/configuration.nix +++ b/pastila/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, nixpkgs-unstable, ... }: let vars = import ../vars.nix; @@ -21,6 +21,15 @@ in ./imap.nix ]; + nixpkgs.overlays = [ + (final: _prev: { + unstable = import nixpkgs-unstable { + system = final.system; + config.allowUnfree = true; + }; + }) + ]; + # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; @@ -67,7 +76,7 @@ in weechat transmission tremc - poezio + unstable.poezio ]; # This option defines the first version of NixOS you have installed on this particular machine,