From 6a0903533d3fcb4edeab063a9f1e88d03adfb85b Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 14 May 2021 02:58:36 +0300 Subject: [PATCH] chore(deps): update flake deps --- flake.lock | 50 +++++++++++++++++++++++++---- flake.nix | 7 +++- profiles/cachix/nixpkgs-wayland.nix | 10 ++++++ users/patriot/default.nix | 2 +- 4 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 profiles/cachix/nixpkgs-wayland.nix diff --git a/flake.lock b/flake.lock index 31a202a..09c4da0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "cachix": { + "locked": { + "lastModified": 1620847774, + "narHash": "sha256-bnzWt++wIpYQElhT0trrI/Mu/O7u9ms6idmnfWKSU9s=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c5429e84111c9e90f3f58029d92bd6c24c5f8e45", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-20.09", + "repo": "nixpkgs", + "type": "github" + } + }, "ci-agent": { "inputs": { "flake-compat": "flake-compat", @@ -191,11 +207,11 @@ }, "latest": { "locked": { - "lastModified": 1620942579, - "narHash": "sha256-Mg+liMXvZ5pKpexvM8c4DNpLAt1NwgTfaqtoPIPk1ig=", + "lastModified": 1620948329, + "narHash": "sha256-xt/7eMkEPTJ3RN6LAb4mQnZ1IDoslU1N1ZENtSOugRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98352e54399b576d783ccfca595919e5ad1ae2b8", + "rev": "a083de02b6eaffdfe7e63b981feb80746b3cc54d", "type": "github" }, "original": { @@ -326,13 +342,34 @@ "type": "github" } }, + "nixpkgsWayland": { + "inputs": { + "cachix": "cachix", + "nixpkgs": [ + "nixos" + ] + }, + "locked": { + "lastModified": 1620943092, + "narHash": "sha256-UBIBe7UN+gW+Y9ysh3EDD95axOWXOGkQU9jzupo+UBw=", + "owner": "colemickens", + "repo": "nixpkgs-wayland", + "rev": "5e8785b3e986f19d21828b423800b9d68b0e355e", + "type": "github" + }, + "original": { + "owner": "colemickens", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, "nur": { "locked": { - "lastModified": 1620943888, - "narHash": "sha256-PEsFurhY+6sW4Q5jAvzRAA3TKhPo/H7dEAWu8iiZUPs=", + "lastModified": 1620948952, + "narHash": "sha256-w0XuYRVxJ1iCim4Lt/YlDqgbSUEdvIv26mOh4IzNu6U=", "owner": "nix-community", "repo": "NUR", - "rev": "58b1ff81fdc33aeab73db785f86670ccd235beab", + "rev": "fbd5801897cca51b5cb57f7a1a938b2ec9288b52", "type": "github" }, "original": { @@ -384,6 +421,7 @@ "nixos": "nixos", "nixos-hardware": "nixos-hardware", "nixosPersistence": "nixosPersistence", + "nixpkgsWayland": "nixpkgsWayland", "nur": "nur", "pkgs": "pkgs" } diff --git a/flake.nix b/flake.nix index d68e60a..0f25271 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,13 @@ url = "github:aaronjanse/nix-eval-lsp"; inputs.nixpkgs.follows = "nixos"; }; + nixpkgsWayland = { + url = "github:colemickens/nixpkgs-wayland"; + inputs.nixpkgs.follows = "nixos"; + }; }; - outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, ... }: + outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, nixpkgsWayland, ... }: digga.lib.mkFlake { inherit self inputs; @@ -41,6 +45,7 @@ ./pkgs/default.nix pkgs.overlay # for `srcs` nur.overlay + nixpkgsWayland.overlay ]; }; latest = { }; diff --git a/profiles/cachix/nixpkgs-wayland.nix b/profiles/cachix/nixpkgs-wayland.nix new file mode 100644 index 0000000..aa84dce --- /dev/null +++ b/profiles/cachix/nixpkgs-wayland.nix @@ -0,0 +1,10 @@ +{ + nix = { + binaryCaches = [ + "https://nixpkgs-wayland.cachix.org" + ]; + binaryCachePublicKeys = [ + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + ]; + }; +} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 3a7246c..6a55ee1 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -24,7 +24,7 @@ in extraPortals = with pkgs; [ xdg-desktop-portal xdg-desktop-portal-gtk - xdg-desktop-portal-wlr + # xdg-desktop-portal-wlr ]; };